Cleaned up openshift_node_group; fixed the labels; added a playbook to invoke just the openshift_node_group

playbooks/openshift-master/openshift_node_config.yml

@@ -0,0 +1,4 @@
+---
+- import_playbook: ../init/main.yml
+
+- import_playbook: private/openshift_node_config.yml

playbooks/openshift-master/private/openshift_node_config.yml

@@ -0,0 +1,7 @@
+---
+- name: Configure node configmap on the master
+  hosts: oo_first_master
+  gather_facts: no
+  tasks:
+  - name: include openshift node config
+    import_tasks: tasks/node_config.yml

playbooks/openshift-master/private/tasks/enable_bootstrap_config.yml

@@ -1,7 +1,5 @@
 ---
-- name: Setup the node group config maps
-  import_role:
-    name: openshift_node_group
+- import_tasks: node_config.yml
 
 - name: Setup the node bootstrap auto approver
   import_role:

playbooks/openshift-master/private/tasks/node_config.yml

@@ -0,0 +1,4 @@
+---
+- name: Setup the node group config maps
+  import_role:
+    name: openshift_node_group

roles/openshift_node_group/defaults/main.yml

@@ -19,6 +19,10 @@ openshift_node_group_edits: []
 openshift_node_group_namespace: openshift-node
 openshift_node_group_labels: []
 
+openshift_node_labels_edit:
+- key: kubeletArguments.node-labels
+  value: "{{ openshift_node_group_labels }}"
+
 openshift_use_crio: False
 l_crio_var_sock: "/var/run/crio/crio.sock"
 

roles/openshift_node_group/tasks/create_config.yml

@@ -39,7 +39,7 @@
     yedit:
       content:
       src: "{{ mktempout.stdout }}/node-config.yaml"
-      edits: "{{ openshift_node_group_edits }}"
+      edits: "{{ openshift_node_group_edits | union(openshift_node_labels_edit) }}"
     register: yeditout
     when: openshift_node_group_edits|length > 0
     run_once: true

roles/openshift_node_group/templates/node-config.yaml.j2

@@ -50,8 +50,7 @@ kubeletArguments:
   cloud-provider:
   - {{ openshift_node_group_cloud_provider }}
 {% endif %}
-  node-labels: 
-  - "{{ openshift_node_group_labels | join(',') }}"
+  node-labels: []
   enable-controller-attach-detach:
   - 'true'
 masterClientConnectionOverrides: