diff options
| author | Russell Teague <rteague@redhat.com> | 2017-01-26 19:59:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 19:59:05 -0500 |
| commit | 3e00b0082c1af7cc77957bbad9ea514874681fb1 (patch) | |
| tree | 14ccfa4385cb562ef486713ea73600458fd15f0a /playbooks | |
| parent | 8f2b3f132bc6cd03640c31c0c33cffb01f80138c (diff) | |
| parent | 31f0a163e0d970bce376fe1f75b8dcc390a162c4 (diff) | |
| download | openshift-3e00b0082c1af7cc77957bbad9ea514874681fb1.tar.gz openshift-3e00b0082c1af7cc77957bbad9ea514874681fb1.tar.bz2 openshift-3e00b0082c1af7cc77957bbad9ea514874681fb1.tar.xz openshift-3e00b0082c1af7cc77957bbad9ea514874681fb1.zip | |
Merge pull request #3198 from mtnbikenc/drain-fix
Correct usage of draining nodes
Diffstat (limited to 'playbooks')
3 files changed, 4 insertions, 5 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index dc0bf73a2..13e1da961 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 }} {{ openshift.common.evacuate_or_drain }} --force + {{ openshift.common.admin_binary }} drain {{ openshift.node.nodename }} --force --delete-local-data 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 2383836d4..a0e3f1d8a 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates.yml @@ -228,9 +228,8 @@ - name: Drain node command: > - {{ openshift.common.client_binary }} adm --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig - manage-node {{ openshift.node.nodename }} - {{ openshift.common.evacuate_or_drain }} --force + {{ openshift.common.admin_binary }} --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig + drain {{ openshift.node.nodename }} --force --delete-local-data 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 2bb460815..5fa74898f 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 }} {{ openshift.common.evacuate_or_drain }} --force + {{ hostvars[groups.oo_first_master.0].openshift.common.admin_binary }} drain {{ openshift.node.nodename | lower }} --force --delete-local-data delegate_to: "{{ groups.oo_first_master.0 }}" when: inventory_hostname in groups.oo_nodes_to_upgrade |