summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-05-18 17:01:29 -0400
committerJason DeTiberus <detiber@gmail.com>2016-05-18 17:01:29 -0400
commitc78e91c7d4a304cc5d20135e96206008407c5f6f (patch)
tree2fb057283348a768311c71a63b0802844614580e /playbooks/common
parent61cf00f81edc2a9e3b425ba90e431743d6457696 (diff)
parent83f3796b348d5689969ab8355cd41303cba94cf4 (diff)
downloadopenshift-c78e91c7d4a304cc5d20135e96206008407c5f6f.tar.gz
openshift-c78e91c7d4a304cc5d20135e96206008407c5f6f.tar.bz2
openshift-c78e91c7d4a304cc5d20135e96206008407c5f6f.tar.xz
openshift-c78e91c7d4a304cc5d20135e96206008407c5f6f.zip
Merge pull request #1914 from jkroepke/patch-1
Task "Update router image to current version" failed, if router not in default namespace
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml4
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