diff options
| author | Russell Teague <rteague@redhat.com> | 2017-02-08 09:26:51 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-02-13 14:15:49 -0500 |
| commit | 8fd0bcfaa48b8fb62585dc96aa87741c58afe5cd (patch) | |
| tree | e2aa9a1731f12b4b04bde68fc0be04094a7430eb /playbooks/byo | |
| parent | 671062646c9a409470be374408f104352af825f0 (diff) | |
| download | openshift-8fd0bcfaa48b8fb62585dc96aa87741c58afe5cd.tar.gz openshift-8fd0bcfaa48b8fb62585dc96aa87741c58afe5cd.tar.bz2 openshift-8fd0bcfaa48b8fb62585dc96aa87741c58afe5cd.tar.xz openshift-8fd0bcfaa48b8fb62585dc96aa87741c58afe5cd.zip | |
Modify playbooks to use oadm_manage_node module
Diffstat (limited to 'playbooks/byo')
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index 13e1da961..5d3280328 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -22,12 +22,24 @@ hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config serial: 1 any_errors_fatal: true + + roles: + - lib_openshift + tasks: - - name: Prepare for Node draining - command: > - {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --schedulable=false + - name: Mark node unschedulable + oadm_manage_node: + node: "{{ openshift.node.nodename | lower }}" + 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 + retries: 10 + delay: 5 + register: node_unschedulable + until: node_unschedulable|succeeded + when: + - l_docker_upgrade is defined + - l_docker_upgrade | bool + - inventory_hostname in groups.oo_nodes_to_upgrade - name: Drain Node for Kubelet upgrade command: > @@ -39,7 +51,12 @@ when: l_docker_upgrade is defined and l_docker_upgrade | bool - name: Set node schedulability - command: > - {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} --schedulable=true + oadm_manage_node: + node: "{{ openshift.node.nodename | lower }}" + schedulable: True 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 and openshift.node.schedulable | bool + retries: 10 + delay: 5 + register: node_schedulable + until: node_schedulable|succeeded + when: node_unschedulable|changed |