summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-08-14 11:14:52 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-08-14 11:14:52 -0400
commit917c06381a65a5f5453559384afaa7f909c3d357 (patch)
treec89013943851097897085151806b0e65269b488a /roles
parent52952a7c0f8f9324704dcc60014dc0bb09fb8a2b (diff)
parent65f9922028595c36eb10c8f43b4db51817d64c32 (diff)
downloadopenshift-917c06381a65a5f5453559384afaa7f909c3d357.tar.gz
openshift-917c06381a65a5f5453559384afaa7f909c3d357.tar.bz2
openshift-917c06381a65a5f5453559384afaa7f909c3d357.tar.xz
openshift-917c06381a65a5f5453559384afaa7f909c3d357.zip
Merge pull request #467 from detiber/fixNodeLabeling
Fix for node labeling where internal node name != inventory_hostname
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_manage_node/tasks/main.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index 472d63efe..cbf1c667f 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -19,8 +19,7 @@
- name: Label nodes
command: >
- {{ openshift.common.client_binary }} label --overwrite node {{ item }} {{ hostvars[item]['openshift_node_labels'] | oo_combine_dict }}
+ {{ openshift.common.client_binary }} label --overwrite node {{ item.openshift.common.hostname }} {{ item.openshift.node.labels | oo_combine_dict }}
with_items:
- - "{{ openshift_nodes }}"
- when:
- "'openshift_node_labels' in hostvars[item]"
+ - "{{ openshift_node_vars }}"
+ when: "'labels' in item.openshift.node"