summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-01-26 15:25:34 -0500
committerRussell Teague <rteague@redhat.com>2017-01-26 15:38:22 -0500
commit31f0a163e0d970bce376fe1f75b8dcc390a162c4 (patch)
treee6cb36147f94cae62673d019e1305bd465032b9f /playbooks/common/openshift-cluster
parent0dcb6f17107ab6d726e7c22ab379387f145dc993 (diff)
downloadopenshift-31f0a163e0d970bce376fe1f75b8dcc390a162c4.tar.gz
openshift-31f0a163e0d970bce376fe1f75b8dcc390a162c4.tar.bz2
openshift-31f0a163e0d970bce376fe1f75b8dcc390a162c4.tar.xz
openshift-31f0a163e0d970bce376fe1f75b8dcc390a162c4.zip
Correct usage of draining nodes
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/redeploy-certificates.yml5
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml2
2 files changed, 3 insertions, 4 deletions
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