diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-09-26 14:20:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 14:20:13 -0400 |
| commit | f7ba21be241e9a3f3354b44332611fe5095fc57f (patch) | |
| tree | 4f981163b3b792d2af3de610e66f4eac2a65f1f9 /roles/openshift_manage_node | |
| parent | b7aaf7bd860625a1dc929a2397c28c3e33aab94f (diff) | |
| parent | 1f2276fff1e41c1d9440ee8b589042ee249b95d7 (diff) | |
| download | openshift-f7ba21be241e9a3f3354b44332611fe5095fc57f.tar.gz openshift-f7ba21be241e9a3f3354b44332611fe5095fc57f.tar.bz2 openshift-f7ba21be241e9a3f3354b44332611fe5095fc57f.tar.xz openshift-f7ba21be241e9a3f3354b44332611fe5095fc57f.zip | |
Merge pull request #2501 from lhuard1A/fix_openstack_cloudprovider
Fix openstack cloudprovider
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: |