diff options
| author | Jan-Otto Kröpke <jkroepke@users.noreply.github.com> | 2016-05-18 13:59:46 +0200 |
|---|---|---|
| committer | Jan-Otto Kröpke <jkroepke@users.noreply.github.com> | 2016-05-18 13:59:46 +0200 |
| commit | 83f3796b348d5689969ab8355cd41303cba94cf4 (patch) | |
| tree | a60034fc39cf6b7c7af0fc954c6aecb691ddb3b3 /playbooks/common | |
| parent | 1826e93bcf2ba21f0c1c7368dffd091a8bfbf142 (diff) | |
| download | openshift-83f3796b348d5689969ab8355cd41303cba94cf4.tar.gz openshift-83f3796b348d5689969ab8355cd41303cba94cf4.tar.bz2 openshift-83f3796b348d5689969ab8355cd41303cba94cf4.tar.xz openshift-83f3796b348d5689969ab8355cd41303cba94cf4.zip | |
Task "Update router image to current version" failed, if router not in default namespace
Also added hardcoded -n default to registry patch, since oc get has -n default, too.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml index 12e2edfb9..3f4a0b280 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml @@ -37,7 +37,7 @@ - name: Update router image to current version when: all_routers.rc == 0 command: > - {{ oc_cmd }} patch dc/{{ item['labels']['deploymentconfig'] }} -p + {{ oc_cmd }} patch dc/{{ item['labels']['deploymentconfig'] }} -n {{ item['namespace'] }} -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 @@ -52,7 +52,7 @@ - name: Update registry image to current version when: _default_registry.rc == 0 command: > - {{ oc_cmd }} patch dc/docker-registry -p + {{ oc_cmd }} patch dc/docker-registry -p -n default '{"spec":{"template":{"spec":{"containers":[{"name":"registry","image":"{{ registry_image }}"}]}}}}' --api-version=v1 |