summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-node
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-07-23 11:33:55 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-07-23 11:33:55 -0400
commit97f96b71ff8abc2ccf38e745e124c68b91a71146 (patch)
tree5277b77d4652b3c502f7f5f9da4033ae89edd24f /playbooks/common/openshift-node
parent65aa983ce83cafc45d28a1a283525f1fa45a9895 (diff)
parentc4cca1d7184ae859706b5854a04f18095c12f1d6 (diff)
downloadopenshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.gz
openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.bz2
openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.tar.xz
openshift-97f96b71ff8abc2ccf38e745e124c68b91a71146.zip
Merge pull request #376 from wshearn/infra_node_support
Infra node support
Diffstat (limited to 'playbooks/common/openshift-node')
-rw-r--r--playbooks/common/openshift-node/config.yml10
1 files changed, 4 insertions, 6 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index bd35008b8..6ef375bbb 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -129,16 +129,14 @@
openshift_nodes: "{{ hostvars
| oo_select_keys(groups['oo_nodes_to_config'])
| 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_unscheduleable_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] | default([]))
+ | oo_collect('openshift.common.hostname', {'openshift_scheduleable': False}) }}"
pre_tasks:
- set_fact:
openshift_scheduleable_nodes: "{{ hostvars
- | oo_select_keys(groups['oo_nodes_to_config']
- | default([]))
+ | oo_select_keys(groups['oo_nodes_to_config'] | default([]))
| oo_collect('openshift.common.hostname')
| difference(openshift_unscheduleable_nodes) }}"
+
roles:
- openshift_manage_node