diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-11 16:35:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-11 16:35:14 -0500 |
| commit | 55ab905a838170af0b1848ff3356c3a214fd49cd (patch) | |
| tree | ec2f3fb9fdc1744fa33e686ec8e608a1532057d1 /playbooks | |
| parent | e6ab57050bac90b78eb6a7d997e0c20fb11aaff3 (diff) | |
| parent | 699e895abcdb18ec81c977fb5143eef6794cd807 (diff) | |
| download | openshift-55ab905a838170af0b1848ff3356c3a214fd49cd.tar.gz openshift-55ab905a838170af0b1848ff3356c3a214fd49cd.tar.bz2 openshift-55ab905a838170af0b1848ff3356c3a214fd49cd.tar.xz openshift-55ab905a838170af0b1848ff3356c3a214fd49cd.zip | |
Merge pull request #3074 from tbielawa/GH3070-drainuate
Add a fact to select --evacuate or --drain based on your OCP version
Diffstat (limited to 'playbooks')
3 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index 1e0a6d4e7..dc0bf73a2 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -31,7 +31,7 @@ - name: Drain Node for Kubelet upgrade command: > - {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --drain --force + {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} {{ openshift.common.evacuate_or_drain }} --force 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 diff --git a/playbooks/common/openshift-cluster/redeploy-certificates.yml b/playbooks/common/openshift-cluster/redeploy-certificates.yml index 5fc81bf3a..6e3e04a6b 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates.yml @@ -234,7 +234,7 @@ command: > {{ openshift.common.client_binary }} adm --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig manage-node {{ openshift.node.nodename }} - --drain --force + {{ openshift.common.evacuate_or_drain }} --force delegate_to: "{{ groups.oo_first_master.0 }}" when: openshift_certificates_redeploy_ca | default(false) | bool and was_schedulable | bool diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index 68b111df4..86b344d7a 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -41,7 +41,7 @@ - name: Drain Node for Kubelet upgrade command: > - {{ hostvars[groups.oo_first_master.0].openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename | lower }} --drain --force + {{ hostvars[groups.oo_first_master.0].openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename | lower }} {{ openshift.common.evacuate_or_drain }} --force delegate_to: "{{ groups.oo_first_master.0 }}" when: inventory_hostname in groups.oo_nodes_to_upgrade |