Merge pull request #844 from IBM/dev

Dev to main

Author: rajan-mis

roles/core_configure/tasks/config.yml

@@ -139,3 +139,28 @@
     - ansible_architecture == "s390x"
   ignore_errors: yes
   run_once: true
+
+- block:
+    - name: config | Check if scaleApiEnabled config for scale api is set to yes
+      command: "{{ scale_command_path }}mmlsconfig scaleApiEnabled"
+      register: scale_scaleapienabled
+      failed_when: false
+
+    - name: config | Setting scaleApiEnabled config for scale api
+      command: "{{ scale_command_path }}mmchconfig scaleApiEnabled=yes --force"
+      when:
+         - scale_scaleapienabled.stdout is defined
+         - "'yes' not in scale_scaleapienabled.stdout"
+      register: scale_scaleapienabled_cmd
+      failed_when: false
+
+    - debug:
+         msg: "{{ scale_scaleapienabled_cmd.cmd }}"
+      when: scale_scaleapienabled_cmd.cmd is defined
+      ignore_errors: yes
+      failed_when: false
+
+  when:
+    - scale_type is defined
+  ignore_errors: yes
+  run_once: true

roles/core_configure/tasks/scaleadmd_cluster.yml

@@ -238,6 +238,32 @@
         msg: "{{scale_add_node_list}}"
       when: scale_add_node_list is defined
 
+    - name: cluster | Identify quorum nodes to be added on
+      set_fact:
+          scale_quorum_node_list: "{{ scale_quorum_node_list | default([]) + [hostvars[item].scale_daemon_nodename] }}"
+      when:
+          - hostvars[item].scale_state is defined and hostvars[item].scale_state != 'absent'
+          - not hostvars[item].scale_cluster_clusterId.stdout
+          - hostvars[item].scale_cluster_clusterId.stderr
+          - hostvars[item].scale_cluster_quorum is defined and hostvars[item].scale_cluster_quorum | bool 
+      with_items:
+        - "{{ ansible_play_hosts }}"
+      changed_when: false
+
+
+    - name: cluster | Identify manager nodes to be added on
+      set_fact:
+          scale_manager_node_list: "{{ scale_manager_node_list | default([]) + [hostvars[item].scale_daemon_nodename] }}"
+      when:
+          - hostvars[item].scale_state is defined and hostvars[item].scale_state != 'absent'
+          - not hostvars[item].scale_cluster_clusterId.stdout
+          - hostvars[item].scale_cluster_clusterId.stderr
+          - hostvars[item].scale_cluster_manager is defined and hostvars[item].scale_cluster_manager | bool 
+      with_items:
+        - "{{ ansible_play_hosts }}"
+      changed_when: false
+
+
     - name: cluster | Prepare existing cluster NodeFile
       template:
         src: AddNodeFile.j2
@@ -268,12 +294,52 @@
       file:
         path: /var/mmfs/tmp/NodeFile
         state: absent
+
+    - name: cluster | Accept server license for quorum nodes
+      command: /usr/lpp/mmfs/bin/mmchlicense server --accept -N "{{ scale_quorum_node_list | join(',') }}"
+      when: scale_quorum_node_list is defined and scale_quorum_node_list |length > 0
+      failed_when: false
+      ignore_errors: yes
+
+    - name: cluster | Change roles of quorum nodes
+      command: /usr/lpp/mmfs/bin/mmchnode --quorum -N "{{ scale_quorum_node_list | join(',') }}"
+      when: scale_quorum_node_list is defined and scale_quorum_node_list |length > 0
+      failed_when: false
+      ignore_errors: yes
+    
+    - name: cluster | Accept server license for manager nodes
+      command: /usr/lpp/mmfs/bin/mmchlicense server --accept -N "{{ scale_manager_node_list | join(',') }}"
+      when: scale_manager_node_list is defined and scale_manager_node_list |length > 0
+      failed_when: false
+      ignore_errors: yes
+
+    - name: cluster | Change roles of manager nodes
+      command: /usr/lpp/mmfs/bin/mmchnode --manager -N "{{ scale_manager_node_list | join(',') }}"
+      when: scale_manager_node_list is defined and scale_manager_node_list |length > 0
+      failed_when: false
+      ignore_errors: yes
+
   when:
     - groups['scale_cluster_candidates'] is defined
     - groups['scale_cluster_members'] is defined
   run_once: true
   delegate_to: "{{ groups['scale_cluster_members'].0 }}"
 
+- name: cluster | Node identity
+  command: /usr/lpp/mmfs/bin/scalectl node config get
+  register: nodeidentity_exist_results
+  ignore_errors: yes
+  failed_when: false
+
+- name: cluster | Restart scaleadmd ( workaround)
+  command: systemctl restart scaleadmd
+  ignore_errors: yes
+  failed_when: false
+  when: 
+    - nodeidentity_exist_results.stderr is defined
+    - ('"/var/mmfs/run/grpc.admin.sock" in nodeidentity_exist_results.stderr') or
+      ('"/var/mmfs/run/scaleadmd.grpc.sock" in nodeidentity_exist_results.stderr')
+
 - meta: flush_handlers
 
 # Node roles will be finalized after daemons are started...

roles/core_install/tasks/install_nodeid.yml

@@ -6,46 +6,58 @@
 - block:
     - name: install| Creates default directory
       file:
-        path: "{{ scale_node_id_config.cert_dir_location }}"
+        path: "{{ hostvars[inventory_hostname].cert_dir_location }}"
         state: directory
         mode: '0600'
         recurse: yes
-      when: scale_node_id_config.cert_dir_location is defined
+      when: hostvars[inventory_hostname].cert_dir_location is defined
 
     - name: install | Copy installation package to node
       copy:
-        src: "{{ scale_node_id_config.cert }}"
-        dest: "{{ scale_node_id_config.cert }}"
+        src: "{{ hostvars[inventory_hostname].node_cert }}"
+        dest: "{{ hostvars[inventory_hostname].node_cert }}"
         mode: '0600'
 
     - name: install | Copy installation package to node
       copy:
-        src: "{{ scale_node_id_config.key }}"
-        dest: "{{ scale_node_id_config.key }}"
+        src: "{{ hostvars[inventory_hostname].node_cert_key }}"
+        dest: "{{ hostvars[inventory_hostname].node_cert_key }}"
         mode: '0600'
 
     - name: install | Copy installation package to node
       copy:
-        src: "{{ scale_node_id_config.chain }}"
-        dest: "{{ scale_node_id_config.chain }}"
+        src: "{{ hostvars[inventory_hostname].node_cert_chain }}"
+        dest: "{{ hostvars[inventory_hostname].node_cert_chain }}"
         mode: '0600'
 
     - name: cluster | Node identity
-      command: /usr/lpp/mmfs/bin/scalectl nodeid get
+      command: /usr/lpp/mmfs/bin/scalectl node config get
       register: nodeidentity_exist_results
+      ignore_errors: yes
+      failed_when: false
+
+    - name: cluster | Restart scaleadmd ( workaround)
+      command: systemctl restart scaleadmd
+      ignore_errors: yes
+      failed_when: false
+      when: 
+          - nodeidentity_exist_results.stderr is defined
+          - ('"/var/mmfs/run/grpc.admin.sock" in nodeidentity_exist_results.stderr') or
+            ('"/var/mmfs/run/scaleadmd.grpc.sock" in nodeidentity_exist_results.stderr')
 
     - debug:
             msg: "{{nodeidentity_exist_results}}"
 
     - name: cluster | Node identity
-      command: /usr/lpp/mmfs/bin/scalectl nodeid import  --cert {{ scale_node_id_config.cert }} --key {{ scale_node_id_config.key }} --chain {{ scale_node_id_config.chain }}
+      command: /usr/lpp/mmfs/bin/scalectl node config set --cert {{ hostvars[inventory_hostname].node_cert }} --key {{ hostvars[inventory_hostname].node_cert_key }} --chain {{ hostvars[inventory_hostname].node_cert_chain }}
       register: nodeidentity_results
-      when: nodeidentity_exist_results.stdout_lines | length < 1
+      retries: 5
+      delay: 30
+      #when: nodeidentity_exist_results.stdout_lines | length < 1
   when:
-    - scale_node_id_config is defined
-    - scale_node_id_config.cert is defined
-    - scale_node_id_config.key is defined
-    - scale_node_id_config.chain is defined
+    - hostvars[inventory_hostname].node_cert is defined
+    - hostvars[inventory_hostname].node_cert_key is defined
+    - hostvars[inventory_hostname].node_cert_chain is defined
 
 - debug:
      msg: "{{ nodeidentity_results.cmd }}"

roles/core_install/tasks/install_repository.yml

@@ -19,6 +19,23 @@
     - ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf'
     - scale_install_repository_url is defined
     - scale_install_repository_url != 'existing'
+
+- name: install | Configure GPFS Scale API YUM repository
+  yum_repository:
+    name: spectrum-scale-scaleapi
+    description: IBM Spectrum Scale Scale API (GPFS)
+    baseurl: "{{ scale_install_repository_url }}scaleapi_rpms/"
+    gpgcheck: "{{ scale_install_gpgcheck }}"
+    repo_gpgcheck: no
+    sslverify: no
+    state: present
+  notify: yum-clean-metadata
+  when:
+    - scale_scaleadmd is defined
+    - ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf'
+    - scale_install_repository_url is defined
+    - scale_install_repository_url != 'existing'
+
 #
 # Configure apt repository
 #
@@ -76,3 +93,13 @@
     scale_install_all_packages: "{{ scale_install_all_packages + [ item ] }}"
   when: scale_install_gplbin_package is undefined
   with_items: "{{ scale_install_gplsrc_packages }}"
+
+#
+# Add GPFS packages for building scale-api from source
+#
+- name: install | Add scale api package to list
+  set_fact:
+    scale_install_all_packages: "{{ scale_install_all_packages + [ item ] }}"
+  when: scale_scaleadmd is defined
+  with_items:
+      - gpfs.scaleapi

roles/core_install/tasks/main.yml

@@ -6,3 +6,11 @@
 
 - import_tasks: build.yml
   tags: build
+
+- import_tasks: install_nodeid.yml
+  tags: install
+  when:
+    - scale_scaleadmd is defined
+    - hostvars[inventory_hostname].node_cert is defined and hostvars[inventory_hostname].node_cert != "None"
+    - hostvars[inventory_hostname].node_cert_key is defined and hostvars[inventory_hostname].node_cert_key != "None"
+    - hostvars[inventory_hostname].node_cert_chain is defined and hostvars[inventory_hostname].node_cert_chain != "None"

roles/core_upgrade/tasks/install_repository.yml

@@ -28,6 +28,22 @@
     - scale_install_repository_url is defined
     - scale_install_repository_url != 'existing'
 
+- name: upgrade | Configure GPFS Scale API YUM repository
+  yum_repository:
+    name: spectrum-scale-scaleapi
+    description: IBM Spectrum Scale Scale API (GPFS)
+    baseurl: "{{ scale_install_repository_url }}scaleapi_rpms/"
+    gpgcheck: "{{ scale_install_gpgcheck }}"
+    repo_gpgcheck: no
+    sslverify: no
+    state: present
+  notify: yum-clean-metadata
+  when:
+    - scale_scaleadmd is defined
+    - ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf'
+    - scale_install_repository_url is defined
+    - scale_install_repository_url != 'existing'
+
 #
 # Configure apt repository
 #
@@ -128,3 +144,13 @@
   with_items:
     - gpfs.java*
   when: (is_scale_java_pkg_installed | bool)
+
+#
+# Add GPFS packages for building scale-api from source
+#
+- name: install | Add scale api package to list
+  set_fact:
+    scale_install_all_packages: "{{ scale_install_all_packages + [ item ] }}"
+  when: scale_scaleadmd is defined
+  with_items:
+      - gpfs.scaleapi

roles/fal_install/tasks/install_repository.yml

@@ -40,6 +40,11 @@
     scale_fal_url: 'gpfs_debs/ubuntu/ubuntu22/'
   when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
 
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_debs/ubuntu/ubuntu24/'
+  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24'
+
 - name: install | file audit logging path
   set_fact:
     scale_fal_url: 'gpfs_rpms/sles15/'

roles/fal_upgrade/tasks/install_repository.yml

@@ -47,6 +47,11 @@
     scale_fal_url: 'gpfs_debs/ubuntu/ubuntu22/'
   when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22'
 
+- name: upgrade | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_debs/ubuntu/ubuntu24/'
+  when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24'
+
 - name: upgrade | file audit logging path
   set_fact:
     scale_fal_url: 'gpfs_rpms/sles15/'

roles/nfs_install/tasks/install_repository.yml

@@ -60,6 +60,11 @@
         scale_smb_url: 'smb_debs/ubuntu/ubuntu22/'
      when: ansible_distribution_major_version == '22'
 
+   - name: install | smb path
+     set_fact:
+        scale_smb_url: 'smb_debs/ubuntu/ubuntu24/'
+     when: ansible_distribution_major_version == '24'
+
    - name: install | nfs path
      set_fact:
         scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu20/'
@@ -69,6 +74,11 @@
      set_fact:
         scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/'
      when: ansible_distribution_major_version == '22'
+   
+   - name: install | nfs path
+     set_fact:
+        scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu24/'
+     when: ansible_distribution_major_version == '24'
   when:
      - ansible_distribution in scale_ubuntu_distribution
      - scale_version >= "5.1.4.0"

roles/nfs_upgrade/tasks/install_repository.yml

@@ -74,6 +74,11 @@
      set_fact:
         scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/'
      when: ansible_distribution_major_version == '22'
+
+   - name: upgrade | nfs path
+     set_fact:
+        scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu24/'
+     when: ansible_distribution_major_version == '24'
   when:
      - ansible_distribution in scale_ubuntu_distribution
      - scale_version >= "5.1.4.0"