Fix node labels

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') }}" 

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 }}"