diff options
author | Lénaïc Huard <lhuard@amadeus.com> | 2016-09-26 13:45:03 +0200 |
---|---|---|
committer | Lénaïc Huard <lhuard@amadeus.com> | 2016-09-26 18:19:23 +0200 |
commit | 1f2276fff1e41c1d9440ee8b589042ee249b95d7 (patch) | |
tree | fc048da0edb98d5a27370db1c5a0ba57aa52f0aa /playbooks/common/openshift-cluster/upgrades | |
parent | aaaf82ba6032d0b1e9c36a39a7eda25b8c5f4b84 (diff) | |
download | openshift-1f2276fff1e41c1d9440ee8b589042ee249b95d7.tar.gz openshift-1f2276fff1e41c1d9440ee8b589042ee249b95d7.tar.bz2 openshift-1f2276fff1e41c1d9440ee8b589042ee249b95d7.tar.xz openshift-1f2276fff1e41c1d9440ee8b589042ee249b95d7.zip |
Fix OpenStack cloud provider
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/upgrade.yml index ba4fc63be..8a2784fb4 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade.yml @@ -197,7 +197,7 @@ # 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 + {{ openshift.common.client_binary }} get node {{ openshift.node.nodename }} -o json register: node_output delegate_to: "{{ groups.oo_first_master.0 }}" changed_when: false @@ -209,13 +209,13 @@ - name: Mark unschedulable if host is a node command: > - {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --schedulable=false + {{ openshift.common.admin_binary }} manage-node {{ openshift.node.nodename }} --schedulable=false delegate_to: "{{ groups.oo_first_master.0 }}" when: inventory_hostname in groups.oo_nodes_to_config - name: Evacuate Node for Kubelet upgrade command: > - {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --evacuate --force + {{ openshift.common.admin_binary }} manage-node {{ openshift.node.nodename }} --evacuate --force delegate_to: "{{ groups.oo_first_master.0 }}" when: inventory_hostname in groups.oo_nodes_to_config @@ -237,7 +237,7 @@ - name: Set node schedulability command: > - {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --schedulable=true + {{ openshift.common.admin_binary }} manage-node {{ openshift.node.nodename }} --schedulable=true delegate_to: "{{ groups.oo_first_master.0 }}" when: inventory_hostname in groups.oo_nodes_to_config and was_schedulable | bool |