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 /roles/openshift_manage_node | |
| 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 'roles/openshift_manage_node')
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 10 |
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 f45ade751..d1cc5b274 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.common.hostname | lower }} + {{ openshift.common.client_binary }} get node {{ hostvars[item].openshift.node.nodename }} --config={{ openshift_manage_node_kubeconfig }} -n default register: omd_get_node @@ -26,19 +26,19 @@ - name: Set node schedulability command: > - {{ openshift.common.admin_binary }} manage-node {{ hostvars[item].openshift.common.hostname | lower }} --schedulable={{ 'true' if hostvars[item].openshift.node.schedulable | bool else 'false' }} + {{ openshift.common.admin_binary }} manage-node {{ hostvars[item].openshift.node.nodename }} --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.common.hostname is defined + when: hostvars[item].openshift.node.nodename is defined - name: Label nodes command: > - {{ openshift.common.client_binary }} label --overwrite node {{ hostvars[item].openshift.common.hostname | lower }} {{ hostvars[item].openshift.node.labels | oo_combine_dict }} + {{ openshift.common.client_binary }} label --overwrite node {{ hostvars[item].openshift.node.nodename }} {{ hostvars[item].openshift.node.labels | oo_combine_dict }} --config={{ openshift_manage_node_kubeconfig }} -n default with_items: "{{ openshift_nodes }}" - when: hostvars[item].openshift.common.hostname is defined and 'labels' in hostvars[item].openshift.node and hostvars[item].openshift.node.labels != {} + when: hostvars[item].openshift.node.nodename is defined and 'labels' in hostvars[item].openshift.node and hostvars[item].openshift.node.labels != {} - name: Delete temp directory file: |