summaryrefslogtreecommitdiffstats
path: root/playbooks
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 /playbooks
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 'playbooks')
-rw-r--r--playbooks/common/openshift-node/config.yml3
1 files changed, 2 insertions, 1 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