summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorDiego Castro <spinolacastro@gmail.com>2015-08-13 09:52:22 -0300
committerDiego Castro <spinolacastro@gmail.com>2015-08-13 09:52:22 -0300
commit10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (patch)
tree436e53b269a8a4ab4f2751a1b16052350a5cc5e6 /playbooks/common
parentd307f715764164c8f543d57486718f95b1987875 (diff)
parentcd989f62709db9f858205420869b9a665cc609a1 (diff)
downloadopenshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.gz
openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.bz2
openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.xz
openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.zip
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-node/config.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 6ef375bbb..4010b4c9e 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -128,7 +128,7 @@
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}) }}"
pre_tasks: