summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-08-14 14:51:09 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-08-14 14:51:09 -0400
commit16175aa7db9073ccc8173efea752a66f3b4a27c2 (patch)
tree09a4454d1fde68b4e09645ab3c75705df3fb1443 /roles
parent416866bc973f1b9549d8e3eafb7a0474a9d81b90 (diff)
parenta82ae49cdf7b44b74da9f19cac313f496cfe4e04 (diff)
downloadopenshift-16175aa7db9073ccc8173efea752a66f3b4a27c2.tar.gz
openshift-16175aa7db9073ccc8173efea752a66f3b4a27c2.tar.bz2
openshift-16175aa7db9073ccc8173efea752a66f3b4a27c2.tar.xz
openshift-16175aa7db9073ccc8173efea752a66f3b4a27c2.zip
Merge pull request #475 from wshearn/fix_label
Skip node label if labels are empty
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_manage_node/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index cbf1c667f..74e702248 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -22,4 +22,4 @@
{{ openshift.common.client_binary }} label --overwrite node {{ item.openshift.common.hostname }} {{ item.openshift.node.labels | oo_combine_dict }}
with_items:
- "{{ openshift_node_vars }}"
- when: "'labels' in item.openshift.node"
+ when: "'labels' in item.openshift.node and item.openshift.node.labels != {}"