Merge pull request #186 from rajan-mis/admin_flag

Cloud deployment defect fixes for 64 node cluster , profile and admin flag implementation

Author: rajan-mis

roles/core/cluster/tasks/check.yml

@@ -16,3 +16,20 @@
   set_fact:
     scale_daemon_nodename: "{{ scale_daemon_nodename }}"
   when: hostvars[inventory_hostname].scale_daemon_nodename is undefined
+
+- name: cluster | Assign default admin nodes
+  set_fact:
+     is_admin_node: true
+  when: true not in ansible_play_hosts | map('extract', hostvars, 'is_admin_node') | map('bool') | list
+  with_sequence: start=1 end={{ [ ansible_play_hosts | length, 1 ] | min }}
+  run_once: true
+  delegate_to: "{{ ansible_play_hosts[item | int - 1] }}"
+  delegate_facts: true
+
+- name: cluster | Find admin nodes
+  add_host:
+    name: "{{ item }}"
+    groups: scale_cluster_admin_nodes
+  when: hostvars[item].is_admin_node is defined and hostvars[item].is_admin_node | bool
+  with_items: "{{ ansible_play_hosts }}"
+  changed_when: false

roles/core/cluster/tasks/cluster.yml

@@ -74,6 +74,35 @@
     - scale_cluster_profile_name is defined and scale_cluster_profile_name != 'None'
     - scale_cluster_profile_name not in gpfs_cluster_system_profile
 
+- block:
+    - name: check | cluster profile name validation
+      assert:
+        that:
+          - scale_cluster_profile_name is not match("gpfs.*")
+        msg: >-
+          A user-defined profile must not begin with the string 'gpfs'
+
+    - name: check | cluster profile format validation
+      assert:
+        that:
+          - stat_user_profile_result.matched == 1
+        msg: >-
+          A user-defined profile must have the .profile suffix
+  delegate_to: localhost
+  when:
+    - scale_cluster_profile_name is defined and scale_cluster_profile_name != 'None'
+    - scale_cluster_profile_name not in gpfs_cluster_system_profile
+
+- block:
+    - name: cluster | Copy user defined profile
+      copy:
+        src: "{{ stat_user_profile_result.files.0.path }}"
+        dest: "{{ scale_cluster_profile_system_path }}"
+        mode: a+x
+  when:
+    - scale_cluster_profile_name is defined and scale_cluster_profile_name != 'None'
+    - scale_cluster_profile_name not in gpfs_cluster_system_profile
+
 #
 # Create new cluster
 #
@@ -89,30 +118,6 @@
         patterns: "{{ scale_cluster_profile_name }}.profile"
       register: stat_profile_result
 
-    - block:
-        - name: check | cluster profile name validation
-          assert:
-            that:
-              - scale_cluster_profile_name is not match("gpfs.*")
-            msg: >-
-              A user-defined profile must not begin with the string 'gpfs'
-
-        - name: check | cluster profile format validation
-          assert:
-            that:
-              - stat_user_profile_result.matched == 1
-            msg: >-
-              A user-defined profile must have the .profile suffix
-
-        - name: cluster | Copy user defined profile
-          copy:
-            src: "{{ stat_user_profile_result.files.0.path }}"
-            dest: "{{ scale_cluster_profile_system_path }}"
-            mode: a+x
-      when: 
-        - scale_cluster_profile_name is defined and scale_cluster_profile_name != 'None'
-        - scale_cluster_profile_name not in gpfs_cluster_system_profile
-
     - name: install | Initialize gpfs profile
       set_fact:
          profile_type: ""

roles/core/cluster/tasks/removenode.yml

@@ -22,6 +22,7 @@
         groups: scale_cluster_members
       when:
         - hostvars[item].state is defined and hostvars[item].state == 'present'
+        - hostvars[item].is_admin_node is defined and hostvars[item].is_admin_node|bool
         - hostvars[item].scale_cluster_clusterId.stdout
       with_items: "{{ ansible_play_hosts }}"
       changed_when: false

roles/core/cluster/tasks/storage.yml

@@ -35,6 +35,7 @@
       changed_when: false
       failed_when: false
   run_once: true
+  delegate_to: "{{ groups['scale_cluster_admin_nodes'].0 }}"
 
 - name: storage | Initialize undefined variables
   set_fact:
@@ -99,6 +100,10 @@
         - item.size > 1
       with_items: "{{ scale_storage_stanzafile_new.results }}"
 
+    - name: storage | Wait for NSD configuration to be synced across cluster
+      wait_for:
+        timeout: 30
+
 #
 # Create new filesystems
 #
@@ -310,3 +315,4 @@
         - scale_storage_existing_fsmounts.stdout is search(':' + item.key + ':' + item.key + ':' + scale_cluster_clustername + ':0:')
       with_dict: "{{ scale_storage_fsparams | default({}) }}"
   run_once: true
+  delegate_to: "{{ groups['scale_cluster_admin_nodes'].0 }}"

set_json_variables.yml

@@ -28,6 +28,7 @@
      scale_cluster_gui: "{{ item.is_gui_server | default(false) }}"
      scale_zimon_collector: "{{ item.is_collector_node | default(false) }}"
      state: "{{ item.state | default('present') }}"
+     is_admin_node: "{{ item.is_admin_node | default('true') }}"
      scale_nodeclass: "{{ item.scale_nodeclass | default(omit) }}"
      scale_config: "{{ scale_config | default(omit) }}"
      ansible_ssh_private_key_file: "{{ item.ansible_ssh_private_key_file | default(omit) }}"