diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
| commit | 055921cd545c12733949f37c1af2c0a1296216ec (patch) | |
| tree | 0ad645b9a75eacbb168c9fdc92d585867b5317a4 /roles/openshift_manage_node | |
| parent | 10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (diff) | |
| parent | 922b87ede66f6b7e376d1f46e13327077cd41719 (diff) | |
| download | openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.gz openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.bz2 openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.xz openshift-055921cd545c12733949f37c1af2c0a1296216ec.zip | |
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'roles/openshift_manage_node')
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml index 472d63efe..74e702248 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/roles/openshift_manage_node/tasks/main.yml @@ -19,8 +19,7 @@ - name: Label nodes command: > - {{ openshift.common.client_binary }} label --overwrite node {{ item }} {{ hostvars[item]['openshift_node_labels'] | oo_combine_dict }} + {{ openshift.common.client_binary }} label --overwrite node {{ item.openshift.common.hostname }} {{ item.openshift.node.labels | oo_combine_dict }} with_items: - - "{{ openshift_nodes }}" - when: - "'openshift_node_labels' in hostvars[item]" + - "{{ openshift_node_vars }}" + when: "'labels' in item.openshift.node and item.openshift.node.labels != {}" |