summaryrefslogtreecommitdiffstats
path: root/roles/openshift_manage_node
diff options
context:
space:
mode:
authorDiego Castro <spinolacastro@gmail.com>2015-08-13 09:52:22 -0300
committerDiego Castro <spinolacastro@gmail.com>2015-08-13 09:52:22 -0300
commit10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (patch)
tree436e53b269a8a4ab4f2751a1b16052350a5cc5e6 /roles/openshift_manage_node
parentd307f715764164c8f543d57486718f95b1987875 (diff)
parentcd989f62709db9f858205420869b9a665cc609a1 (diff)
downloadopenshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.gz
openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.bz2
openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.xz
openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.zip
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'roles/openshift_manage_node')
-rw-r--r--roles/openshift_manage_node/tasks/main.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index d17f3f532..472d63efe 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -16,3 +16,11 @@
command: >
{{ openshift.common.admin_binary }} manage-node {{ item }} --schedulable=true
with_items: openshift_scheduleable_nodes
+
+- name: Label nodes
+ command: >
+ {{ openshift.common.client_binary }} label --overwrite node {{ item }} {{ hostvars[item]['openshift_node_labels'] | oo_combine_dict }}
+ with_items:
+ - "{{ openshift_nodes }}"
+ when:
+ "'openshift_node_labels' in hostvars[item]"