diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-15 11:26:10 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-15 11:26:10 -0500 |
| commit | 65e8d09e50a269be1dabb00b0db0890c8f6cf014 (patch) | |
| tree | 2223c8c89f5607e288e1ff7c5af9a0ce346625f9 | |
| parent | ce306085ee0b8667dbba90e3a95199ce066c38d4 (diff) | |
| parent | 1dfb62b848f866c41e7b7b94a929ee9d3a486c91 (diff) | |
| download | openshift-65e8d09e50a269be1dabb00b0db0890c8f6cf014.tar.gz openshift-65e8d09e50a269be1dabb00b0db0890c8f6cf014.tar.bz2 openshift-65e8d09e50a269be1dabb00b0db0890c8f6cf014.tar.xz openshift-65e8d09e50a269be1dabb00b0db0890c8f6cf014.zip | |
Merge pull request #1395 from brenton/master
Updating the 3.1.1 router to match the new liveness probe configuration
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 10 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index 049ac997c..0fb38f32e 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -622,6 +622,16 @@ '{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}"}]}}}}' --api-version=v1 with_items: haproxy_routers + when: not openshift.common.version_gte_3_1_1_or_1_1_1 + + - name: Update router image to current version + when: all_routers.rc == 0 + command: > + {{ oc_cmd }} patch dc/{{ item['labels']['deploymentconfig'] }} -p + '{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}","livenessProbe":{"tcpSocket":null,"httpGet":{"path": "/healthz", "port": 1936, "host": "localhost", "scheme": "HTTP"},"initialDelaySeconds":10,"timeoutSeconds":1}}]}}}}' + --api-version=v1 + with_items: haproxy_routers + when: openshift.common.version_gte_3_1_1_or_1_1_1 - name: Check for default registry command: > diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml index d7a2ac405..196393b2a 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml @@ -37,7 +37,7 @@ when: all_routers.rc == 0 command: > {{ oc_cmd }} patch dc/{{ item['labels']['deploymentconfig'] }} -p - '{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}"}]}}}}' + '{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}","livenessProbe":{"tcpSocket":null,"httpGet":{"path": "/healthz", "port": 1936, "host": "localhost", "scheme": "HTTP"},"initialDelaySeconds":10,"timeoutSeconds":1}}]}}}}' --api-version=v1 with_items: haproxy_routers |