Merge pull request #8487 from mwoodson/master

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,8 @@
+---
+- name: Configure node configmap on the master
+  hosts: oo_first_master
+  gather_facts: no
+  tasks:
+  - name: include openshift node config
+    import_role:
+      name: openshift_node_group

roles/openshift_node_group/defaults/main.yml

@@ -19,6 +19,11 @@ 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 | join(',') }}"
+
 openshift_use_crio: False
 l_crio_var_sock: "/var/run/crio/crio.sock"
 

roles/openshift_node_group/tasks/create_config.yml

@@ -8,7 +8,8 @@
   run_once: true
 
 - name: debug node config
-  debug: var=configout
+  debug:
+    var: configout
   run_once: true
 
 - when:
@@ -39,17 +40,25 @@
     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
 
+  - name: show the yeditout debug var
+    debug:
+      var: yeditout
+    run_once: true
+
   - name: create volume config template
     template:
       src: volume-config.yaml.j2
       dest: "{{ mktempout.stdout }}/volume-config.yaml"
     when:
-    - configout.results.results.0 == {} and openshift_node_group_name != "" and openshift_node_local_quota_per_fsgroup is defined and openshift_node_local_quota_per_fsgroup != ""
+    - "'data' not in configout['results']['results'][0] or 'volume-config.yaml' not in configout['results']['results'][0]['data']"
+    - openshift_node_group_name != ""
+    - openshift_node_local_quota_per_fsgroup is defined
+    - openshift_node_local_quota_per_fsgroup != ""
     run_once: true
 
   - name: lay down the volume config from the existing configmap
@@ -57,10 +66,28 @@
       content: "{{ configout.results.results.0.data['volume-config.yaml'] }}"
       dest: "{{ mktempout.stdout }}/volume-config.yaml"
     when:
-    - configout.results.results.0 != {} and openshift_node_group_name != "" and openshift_node_local_quota_per_fsgroup is defined and openshift_node_local_quota_per_fsgroup != ""
+    - "'data' in configout['results']['results'][0]"
+    - "'volume-config.yaml' in configout['results']['results'][0]['data']"
+    - openshift_node_group_name != ""
+    - openshift_node_local_quota_per_fsgroup is defined
+    - openshift_node_local_quota_per_fsgroup != ""
+    run_once: true
+
+  - name: "specialize the volume config for {{ openshift_node_group_name }}"
+    yedit:
+      content:
+      src: "{{ mktempout.stdout }}/volume-config.yaml"
+      key: localQuota.perFSGroup
+      value: "{{ openshift_node_local_quota_per_fsgroup }}"
+    register: volume_yeditout
+    when:
+    - openshift_node_local_quota_per_fsgroup is defined
+    - openshift_node_local_quota_per_fsgroup != ""
     run_once: true
 
-  - debug: var=yeditout
+  - name: show the volume_yeditout debug var
+    debug:
+      var: volume_yeditout
     run_once: true
 
   - name: create node-config.yaml configmap

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: