summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--playbooks/common/openshift-node/config.yml3
-rw-r--r--roles/openshift_manage_node/tasks/main.yml7
2 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 4010b4c9e..705f7f223 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -128,9 +128,10 @@
vars:
openshift_nodes: "{{ hostvars
| oo_select_keys(groups['oo_nodes_to_config'])
- | oo_collect('openshift.common.hostname') }}"
+ | oo_collect('openshift.common.hostname') }}"
openshift_unscheduleable_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] | default([]))
| oo_collect('openshift.common.hostname', {'openshift_scheduleable': False}) }}"
+ openshift_node_vars: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config']) }}"
pre_tasks:
- set_fact:
openshift_scheduleable_nodes: "{{ hostvars
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"