diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-04 11:10:35 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-04 11:10:35 -0300 |
| commit | b497f7a2a77c3ef1434a5f0bd11fccf9d81b44aa (patch) | |
| tree | 012b76f4c8b828136b076f7dccbace9fb32e1016 /playbooks/common | |
| parent | bec613a2237df25164de03524414224779fcab4c (diff) | |
| download | openshift-b497f7a2a77c3ef1434a5f0bd11fccf9d81b44aa.tar.gz openshift-b497f7a2a77c3ef1434a5f0bd11fccf9d81b44aa.tar.bz2 openshift-b497f7a2a77c3ef1434a5f0bd11fccf9d81b44aa.tar.xz openshift-b497f7a2a77c3ef1434a5f0bd11fccf9d81b44aa.zip | |
Fix node labeling. Issue #305
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 6ef375bbb..122cfbf92 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -126,9 +126,12 @@ - name: Set scheduleability hosts: oo_first_master vars: + openshift_node_labels: "{{ hostvars + | oo_select_keys(groups['oo_nodes_to_config']) + | oo_collect('openshift.node.labels') }}" 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: |