summaryrefslogtreecommitdiffstats
path: root/roles/openshift_manage_node
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-07 16:34:05 -0500
committerScott Dodson <sdodson@redhat.com>2016-11-07 16:49:10 -0500
commit90345971adfb4385c8336e5e3a6ae6487a809bac (patch)
tree32ff47e9073fb88c4369b2cd56d2a58ad913e385 /roles/openshift_manage_node
parent9b1dd97dbf5f205edf4a0e1b24d24a3f9d8a78e6 (diff)
downloadopenshift-90345971adfb4385c8336e5e3a6ae6487a809bac.tar.gz
openshift-90345971adfb4385c8336e5e3a6ae6487a809bac.tar.bz2
openshift-90345971adfb4385c8336e5e3a6ae6487a809bac.tar.xz
openshift-90345971adfb4385c8336e5e3a6ae6487a809bac.zip
Revert "Fix OpenStack cloud provider"
This reverts commit 1f2276fff1e41c1d9440ee8b589042ee249b95d7.
Diffstat (limited to 'roles/openshift_manage_node')
-rw-r--r--roles/openshift_manage_node/tasks/main.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index 28e4e46e9..a1f42f8c4 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -14,7 +14,7 @@
- name: Wait for Node Registration
command: >
- {{ openshift.common.client_binary }} get node {{ hostvars[item].openshift.node.nodename }}
+ {{ openshift.common.client_binary }} get node {{ hostvars[item].openshift.common.hostname }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
register: omd_get_node
@@ -26,19 +26,19 @@
- name: Set node schedulability
command: >
- {{ openshift.common.client_binary }} adm manage-node {{ hostvars[item].openshift.node.nodename }} --schedulable={{ 'true' if hostvars[item].openshift.node.schedulable | bool else 'false' }}
+ {{ openshift.common.client_binary }} adm manage-node {{ hostvars[item].openshift.common.hostname | lower }} --schedulable={{ 'true' if hostvars[item].openshift.node.schedulable | bool else 'false' }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
with_items: "{{ openshift_nodes }}"
- when: hostvars[item].openshift.node.nodename is defined
+ when: hostvars[item].openshift.common.hostname is defined
- name: Label nodes
command: >
- {{ openshift.common.client_binary }} label --overwrite node {{ hostvars[item].openshift.node.nodename }} {{ hostvars[item].openshift.node.labels | oo_combine_dict }}
+ {{ openshift.common.client_binary }} label --overwrite node {{ hostvars[item].openshift.common.hostname | lower }} {{ hostvars[item].openshift.node.labels | oo_combine_dict }}
--config={{ openshift_manage_node_kubeconfig }}
-n default
with_items: "{{ openshift_nodes }}"
- when: hostvars[item].openshift.node.nodename is defined and 'labels' in hostvars[item].openshift.node and hostvars[item].openshift.node.labels != {}
+ when: hostvars[item].openshift.common.hostname is defined and 'labels' in hostvars[item].openshift.node and hostvars[item].openshift.node.labels != {}
- name: Delete temp directory
file: