diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-09 12:40:28 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-10 10:31:52 -0300 |
| commit | c17efa0172a11f79cb28d3c5740b7c16ed70c3b8 (patch) | |
| tree | dfbfb2fa081e8860aea13a0d3c0d2a11031b2ab5 | |
| parent | 6be237602331e88a330c1f46d31aeb97d9af1aa2 (diff) | |
| download | openshift-c17efa0172a11f79cb28d3c5740b7c16ed70c3b8.tar.gz openshift-c17efa0172a11f79cb28d3c5740b7c16ed70c3b8.tar.bz2 openshift-c17efa0172a11f79cb28d3c5740b7c16ed70c3b8.tar.xz openshift-c17efa0172a11f79cb28d3c5740b7c16ed70c3b8.zip | |
Fix node labels
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 122cfbf92..4010b4c9e 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -126,9 +126,6 @@ - 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') }}" diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml index 257bcee2c..c488af723 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/roles/openshift_manage_node/tasks/main.yml @@ -19,7 +19,6 @@ - name: Label nodes command: > - {{ openshift.common.client_binary }} label --overwrite node {{ item.0 }} {{ item.1 | oo_combine_dict }} - with_nested: - - openshift_nodes - - openshift_node_labels + {{ openshift.common.client_binary }} label --overwrite node {{ item }} {{ hostvars[item]['openshift_node_labels'] | oo_combine_dict }} + with_items: + - "{{ openshift_nodes }}" |