diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-25 00:31:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-25 00:31:42 -0800 |
| commit | bf863c250ee92b9fea3d9cfa4040e5ecdbba4479 (patch) | |
| tree | 4598d8a2c1a82195b8a08ab902fd9a0e9e3fbfaf /playbooks/common | |
| parent | 2487fa87fc198bffb61052c5e51da8c618dc939e (diff) | |
| parent | 4e2272db05cf00335701aa6db5ecfd9195623d35 (diff) | |
| download | openshift-bf863c250ee92b9fea3d9cfa4040e5ecdbba4479.tar.gz openshift-bf863c250ee92b9fea3d9cfa4040e5ecdbba4479.tar.bz2 openshift-bf863c250ee92b9fea3d9cfa4040e5ecdbba4479.tar.xz openshift-bf863c250ee92b9fea3d9cfa4040e5ecdbba4479.zip | |
Merge pull request #6849 from vrutkovs/label-masters-with-upstream-standard
Automatic merge from submit-queue.
Label masters with node-role.kubernetes.io/master
This is controlled by `openshift_master_node_label` var in openshift_manage_node
Related to https://bugzilla.redhat.com/show_bug.cgi?id=1535673
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 |