diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-05-24 14:00:17 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@afrolegs.com> | 2016-05-24 14:00:17 -0400 |
| commit | eab842f5b6e5c04cda06c94cf8db3281d82c8ad6 (patch) | |
| tree | b1db958651234887d1c5f3d92dbbc195fa02c624 /playbooks | |
| parent | d22ea74e40519d050ad427a2657f104a41724c74 (diff) | |
| download | openshift-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')
3 files changed, 7 insertions, 5 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index a407e326b..6b1f2f6dd 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -173,12 +173,12 @@ changed_when: False failed_when: False with_items: "{{ images_to_delete.results }}" - + - name: Remove sdn drop files - file: + file: path: /run/openshift-sdn state: absent - + - name: restart docker service: name: docker @@ -199,6 +199,7 @@ - /etc/systemd/system/atomic-openshift-master-api.service - /etc/systemd/system/atomic-openshift-master-controllers.service - /etc/systemd/system/atomic-openshift-node.service + - /etc/systemd/system/atomic-openshift-node-dep.service - /etc/systemd/system/etcd_container.service - /etc/systemd/system/openvswitch.service - /etc/sysconfig/atomic-enterprise-master @@ -211,6 +212,7 @@ - /etc/sysconfig/atomic-openshift-node - /etc/sysconfig/openshift-master - /etc/sysconfig/openshift-node + - /etc/sysconfig/openshift-node - /etc/sysconfig/openvswitch - /etc/sysconfig/origin-master - /etc/sysconfig/origin-master-api 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 |