diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-27 15:44:04 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-27 15:44:04 -0300 |
| commit | f004b526078b78b0ba9435b82af4d4f4d42de5e2 (patch) | |
| tree | db6d63cc97636c6c03185b7047122b723615b403 /playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml | |
| parent | 08f1caed84d46d0263f0c1aaaf2da891946b1a96 (diff) | |
| download | openshift-f004b526078b78b0ba9435b82af4d4f4d42de5e2.tar.gz openshift-f004b526078b78b0ba9435b82af4d4f4d42de5e2.tar.bz2 openshift-f004b526078b78b0ba9435b82af4d4f4d42de5e2.tar.xz openshift-f004b526078b78b0ba9435b82af4d4f4d42de5e2.zip | |
More docker upgrade fixes.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml index 81db9ef20..20d66522f 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/upgrade.yml @@ -11,16 +11,15 @@ - etcd_container - openvswitch failed_when: false - when: docker_upgrade | bool and openshift.common.is_containerized | bool + when: openshift.common.is_containerized | bool - name: Remove all containers and images script: nuke_images.sh docker register: nuke_images_result - when: docker_upgrade | bool and docker_upgrade_nuke_images is defined and docker_upgrade_nuke_images | bool + when: docker_upgrade_nuke_images is defined and docker_upgrade_nuke_images | bool - name: Upgrade Docker action: "{{ ansible_pkg_mgr }} name=docker{{ '-' + docker_version }} state=present" - when: docker_upgrade | bool - name: Restart containerized services service: name={{ item }} state=started @@ -32,7 +31,7 @@ - "{{ openshift.common.service_type }}-master-controllers" - "{{ openshift.common.service_type }}-node" failed_when: false - when: docker_upgrade | bool and openshift.common.is_containerized | bool + when: openshift.common.is_containerized | bool - name: Wait for master API to come back online become: no @@ -42,4 +41,4 @@ state=started delay=10 port="{{ openshift.master.api_port }}" - when: docker_upgrade | bool and inventory_hostname in groups.oo_masters_to_config + when: inventory_hostname in groups.oo_masters_to_config |