diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-12-18 16:13:36 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-12-20 10:13:51 -0500 |
commit | e6c159afb4ba39a7266c750d43d6a5e911cc8f21 (patch) | |
tree | 99cb6240e59a7118b2b4c9be603efc7eaeaf4679 /playbooks/common/openshift-cluster/upgrades/docker | |
parent | a5de165b8e7113631a30ef0e4a20b5f74db073f0 (diff) | |
download | openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.gz openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.bz2 openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.xz openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.zip |
Remove openshift.common.{is_atomic|is_containerized}
We set these variables using facts in init, no need
to duplicate the logic all around the codebase.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/docker')
3 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml index 42cd51bd9..5b8746f2a 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -17,7 +17,7 @@ - fail: msg: Cannot upgrade Docker on Atomic operating systems. - when: openshift.common.is_atomic | bool + when: openshift_is_atomic | bool - include_role: name: container_runtime @@ -54,7 +54,7 @@ - name: Drain Node for Kubelet upgrade command: > - {{ openshift.common.client_binary }} adm drain {{ openshift.node.nodename }} --config={{ openshift.common.config_base }}/master/admin.kubeconfig --force --delete-local-data --ignore-daemonsets + {{ openshift_client_binary }} adm drain {{ openshift.node.nodename }} --config={{ openshift.common.config_base }}/master/admin.kubeconfig --force --delete-local-data --ignore-daemonsets delegate_to: "{{ groups.oo_first_master.0 }}" when: l_docker_upgrade is defined and l_docker_upgrade | bool and inventory_hostname in groups.oo_nodes_to_upgrade register: l_docker_upgrade_drain_result diff --git a/playbooks/common/openshift-cluster/upgrades/docker/tasks/restart.yml b/playbooks/common/openshift-cluster/upgrades/docker/tasks/restart.yml index 385a141ea..3b47a11e0 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/tasks/restart.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/tasks/restart.yml @@ -15,7 +15,7 @@ - "{{ openshift_service_type }}-master-controllers" - "{{ openshift_service_type }}-node" failed_when: false - when: openshift.common.is_containerized | bool + when: openshift_is_containerized | bool - name: Wait for master API to come back online wait_for: diff --git a/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml index b5000d3a1..54eeb2ef5 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml @@ -10,7 +10,7 @@ - etcd_container - openvswitch failed_when: false - when: openshift.common.is_containerized | bool + when: openshift_is_containerized | bool - name: Check Docker image count shell: "docker images -aq | wc -l" |