diff options
| author | Vadim Rutkovsky <vrutkovs@redhat.com> | 2018-01-24 14:50:05 +0100 |
|---|---|---|
| committer | Vadim Rutkovsky <vrutkovs@redhat.com> | 2018-01-24 21:03:09 +0100 |
| commit | f83c41821322d74db35493fcc3a4fcd1c0359bf5 (patch) | |
| tree | b19da11e80e5fa43a59b22dd20601108bd6aa405 /playbooks/common | |
| parent | dd5c2a24872490f34be8516e4f03a4076be35789 (diff) | |
| download | openshift-f83c41821322d74db35493fcc3a4fcd1c0359bf5.tar.gz openshift-f83c41821322d74db35493fcc3a4fcd1c0359bf5.tar.bz2 openshift-f83c41821322d74db35493fcc3a4fcd1c0359bf5.tar.xz openshift-f83c41821322d74db35493fcc3a4fcd1c0359bf5.zip | |
Label masters with node-role.kubernetes.io/master. This PR also sets these labels
and scheduling status during upgrades
Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 15 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | 15 |
2 files changed, 10 insertions, 20 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index e89f06f17..080372c81 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -310,13 +310,8 @@ - import_role: name: openshift_node tasks_from: upgrade.yml - - name: Set node schedulability - oc_adm_manage_node: - node: "{{ openshift.node.nodename | lower }}" - schedulable: True - delegate_to: "{{ groups.oo_first_master.0 }}" - retries: 10 - delay: 5 - register: node_schedulable - until: node_schedulable is succeeded - when: node_unschedulable is changed + - import_role: + name: openshift_manage_node + tasks_from: config.yml + vars: + openshift_master_host: "{{ groups.oo_first_master.0 }}" diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index 850442b3b..915fae9fd 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -50,16 +50,11 @@ - import_role: name: openshift_node tasks_from: upgrade.yml - - name: Set node schedulability - oc_adm_manage_node: - node: "{{ openshift.node.nodename | lower }}" - schedulable: True - delegate_to: "{{ groups.oo_first_master.0 }}" - retries: 10 - delay: 5 - register: node_schedulable - until: node_schedulable is succeeded - when: node_unschedulable is changed + - import_role: + name: openshift_manage_node + tasks_from: config.yml + vars: + openshift_master_host: "{{ groups.oo_first_master.0 }}" - name: Re-enable excluders hosts: oo_nodes_to_upgrade:!oo_masters_to_config |