summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-08-13 16:15:44 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-08-13 21:44:54 -0400
commit65f9922028595c36eb10c8f43b4db51817d64c32 (patch)
tree1f6149994644d98c09c19a39dcb3d1281d3c14a3 /roles
parent1399425c70052445cc8659fd12cd19535fb95e5a (diff)
downloadopenshift-65f9922028595c36eb10c8f43b4db51817d64c32.tar.gz
openshift-65f9922028595c36eb10c8f43b4db51817d64c32.tar.bz2
openshift-65f9922028595c36eb10c8f43b4db51817d64c32.tar.xz
openshift-65f9922028595c36eb10c8f43b4db51817d64c32.zip
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"