summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-05-24 14:00:17 -0400
committerAndrew Butcher <abutcher@afrolegs.com>2016-05-24 14:00:17 -0400
commiteab842f5b6e5c04cda06c94cf8db3281d82c8ad6 (patch)
treeb1db958651234887d1c5f3d92dbbc195fa02c624 /playbooks/common
parentd22ea74e40519d050ad427a2657f104a41724c74 (diff)
downloadopenshift-eab842f5b6e5c04cda06c94cf8db3281d82c8ad6.tar.gz
openshift-eab842f5b6e5c04cda06c94cf8db3281d82c8ad6.tar.bz2
openshift-eab842f5b6e5c04cda06c94cf8db3281d82c8ad6.tar.xz
openshift-eab842f5b6e5c04cda06c94cf8db3281d82c8ad6.zip
Conditionally bind mount /usr/bin/docker-current when it is present (#1941)
* Conditionally bind mount /usr/bin/docker-current when it is present * fix upgrade * add atomic-openshift-node-dep files to uninstall playbook * Fix variable expansion
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh2
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh b/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
index 96944a78b..9bbeff660 100644
--- a/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
+++ b/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
@@ -2,7 +2,7 @@
# Here we don't really care if this is a master, api, controller or node image.
# We just need to know the version of one of them.
-unit_file=$(ls /etc/systemd/system/${1}*.service | head -n1)
+unit_file=$(ls /etc/systemd/system/${1}*.service | grep -v node-dep | head -n1)
if [ ${1} == "origin" ]; then
image_name="openshift/origin"
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 3f4a0b280..31e76805c 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
@@ -52,7 +52,7 @@
- name: Update registry image to current version
when: _default_registry.rc == 0
command: >
- {{ oc_cmd }} patch dc/docker-registry -p -n default
+ {{ oc_cmd }} patch dc/docker-registry -n default -p
'{"spec":{"template":{"spec":{"containers":[{"name":"registry","image":"{{ registry_image }}"}]}}}}'
--api-version=v1