diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-02 14:52:46 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-09-02 14:56:15 -0400 |
| commit | 66c902d8be315cd05042d63500958b2319c3d0d7 (patch) | |
| tree | 0467a9c31132512391c172d74d72f815018112c4 | |
| parent | 14e9f6e31fefaf9dad7d3025ca2d6328d2d65b3a (diff) | |
| download | openshift-66c902d8be315cd05042d63500958b2319c3d0d7.tar.gz openshift-66c902d8be315cd05042d63500958b2319c3d0d7.tar.bz2 openshift-66c902d8be315cd05042d63500958b2319c3d0d7.tar.xz openshift-66c902d8be315cd05042d63500958b2319c3d0d7.zip | |
Record schedulability of node prior to upgrade and re-set it to that
Previously we were setting schedulability to the state defined in the inventory
without regard to whether or not it was manually made schedulable or
unschedulable. The right thing seems to be to record the state prior to upgrade
and set it back.
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade.yml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/upgrade.yml index be4e02c4a..cb5103e3a 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade.yml @@ -173,6 +173,18 @@ # TODO: To better handle re-trying failed upgrades, it would be nice to check if the node # or docker actually needs an upgrade before proceeding. Perhaps best to save this until # we merge upgrade functionality into the base roles and a normal config.yml playbook run. + - name: Determine if node is currently scheduleable + command: > + {{ openshift.common.client_binary }} get node {{ openshift.common.hostname | lower }} -o json + register: node_output + delegate_to: "{{ groups.oo_first_master.0 }}" + changed_when: false + when: inventory_hostname in groups.oo_nodes_to_config + + - set_fact: + was_schedulable: "{{ 'unschedulable' not in (node_output.stdout | from_json).spec }}" + when: inventory_hostname in groups.oo_nodes_to_config + - name: Mark unschedulable if host is a node command: > {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --schedulable=false @@ -203,7 +215,7 @@ command: > {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --schedulable=true delegate_to: "{{ groups.oo_first_master.0 }}" - when: inventory_hostname in groups.oo_nodes_to_config and openshift.node.schedulable | bool + when: inventory_hostname in groups.oo_nodes_to_config and was_schedulable | bool ############################################################################## |