diff options
| author | Tim Bielawa <timbielawa@gmail.com> | 2016-12-19 09:15:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 09:15:52 -0800 |
| commit | 735229cee3fb1af5f0c67717554d419f5201686c (patch) | |
| tree | 1b611657db8810f465c853fff9897e5417ee11e2 /playbooks/byo | |
| parent | b8109cdf7e909eb6a255c795a99b078b850f49f0 (diff) | |
| parent | 96df370b8208d0a90dac7e38857dbcdce52fd161 (diff) | |
| download | openshift-735229cee3fb1af5f0c67717554d419f5201686c.tar.gz openshift-735229cee3fb1af5f0c67717554d419f5201686c.tar.bz2 openshift-735229cee3fb1af5f0c67717554d419f5201686c.tar.xz openshift-735229cee3fb1af5f0c67717554d419f5201686c.zip | |
Merge pull request #2986 from tbielawa/deprecate_node_evacuation
Deprecate node 'evacuation' with 'drain'
Diffstat (limited to 'playbooks/byo')
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index 0d451cf77..1e0a6d4e7 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -18,20 +18,20 @@ # If a node fails, halt everything, the admin will need to clean up and we # don't want to carry on, potentially taking out every node. The playbook can safely be re-run # and will not take any action on a node already running the requested docker version. -- name: Evacuate and upgrade nodes +- name: Drain and upgrade nodes hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config serial: 1 any_errors_fatal: true tasks: - - name: Prepare for Node evacuation + - name: Prepare for Node draining command: > {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --schedulable=false 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 - - name: Evacuate Node for Kubelet upgrade + - name: Drain Node for Kubelet upgrade command: > - {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --evacuate --force + {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --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 |