Merge pull request #555 from IBM/dev

Dev ==> Master

Author: rajan-mis

roles/callhome/node/tasks/zypper/install.yml

@@ -12,3 +12,6 @@
 
 - name: install | Enable repo metadata gpg check
   command: "zypper modifyrepo --default-gpgcheck --all"
+  args:
+    warn: false 
+

roles/core/cluster/tasks/cluster.yml

@@ -73,6 +73,7 @@
   find:
     paths: "{{ scale_cluster_profile_dir_path }}"
     patterns: "{{ scale_cluster_profile_name }}.profile"
+    hidden: yes
   register: stat_user_profile_result
   run_once: true
   delegate_to: localhost
@@ -104,7 +105,7 @@
       copy:
         src: "{{ stat_user_profile_result.files.0.path }}"
         dest: "{{ scale_cluster_profile_system_path }}"
-        mode: a+x
+        mode: '0444'
   when:
     - scale_cluster_profile_name is defined and scale_cluster_profile_name != 'None'
     - scale_cluster_profile_name not in gpfs_cluster_system_profile
@@ -134,7 +135,7 @@
          profile_type: "--profile {{ scale_cluster_profile_name }}"
       when:
         - scale_cluster_profile_name is defined and scale_cluster_profile_name != 'None'
-        - (stat_profile_result.matched) == 1 or (stat_user_profile_result is defined and stat_user_profile_result.matched == 1)
+        - (stat_profile_result.matched is defined and stat_profile_result.matched == 1) or (stat_user_profile_result.matched is defined and stat_user_profile_result.matched == 1)
 
     - name: cluster | Set gpfs remote shell command if it is defined
       set_fact:

roles/core/cluster/tasks/config.yml

@@ -114,3 +114,28 @@
   when:
     - scale_cluster_config is defined and scale_cluster_config.ephemeral_port_range is defined
   run_once: true
+
+- block:
+    - name: config | Check if numaMemoryInterleave config for s390x is set to yes
+      command: "{{ scale_command_path }}mmlsconfig numaMemoryInterleave"
+      register: scale_numamemory
+      failed_when: false
+
+    - name: config | Setting numaMemoryInterleave config for s390x
+      command: "{{ scale_command_path }}mmchconfig numaMemoryInterleave=no"
+      when:
+         - scale_numamemory.stdout is defined
+         - "'yes' in scale_numamemory.stdout"
+      register: scale_numamemory_cmd
+      failed_when: false
+
+    - debug:
+         msg: "{{ scale_numamemory_cmd.cmd }}"
+      when: scale_numamemory_cmd.cmd is defined
+      ignore_errors: yes
+      failed_when: false
+
+  when:
+    - ansible_architecture == "s390x"
+  ignore_errors: yes
+  run_once: true

roles/gui/README.md

@@ -156,7 +156,7 @@ scale_cluster_gui: true  ##Dual/HA GUI
 ```
 
 
-- For more information check out man pages and https://www.ibm.com/support/knowledgecenter/en/STXKQY/ibmspectrumscale_welcome.html
+- For more information check out man pages and https://www.ibm.com/docs/en/spectrum-scale
 
 
 

roles/nfs/node/tasks/yum/install.yml

@@ -1,16 +1,7 @@
 ---
-- name: install | Initialize
-  set_fact:
-    disable_gpgcheck: "no"
-
-- name: install | Disable gpg check
-  set_fact:
-    disable_gpgcheck: "yes"
-  when: scale_version < '5.0.4.0'
-
 - name: install | Install GPFS nfs packages
   yum:
    name: "{{ scale_install_all_packages }}"
    state: present
-   disable_gpg_check: "{{ disable_gpgcheck }}"
+   disable_gpg_check: "{{ scale_disable_gpgcheck }}"
   when: ansible_fqdn in scale_nfs_nodes_list

roles/nfs/upgrade/tasks/yum/install.yml

@@ -1,15 +1,6 @@
 ---
-- name: upgrade | Initialize
-  set_fact:
-    disable_gpgcheck: "no"
-
-- name: upgrade | Disable gpg check
-  set_fact:
-    disable_gpgcheck: "yes"
-  when: scale_version < '5.0.4.0'
-
 - name: upgrade | Upgrade GPFS nfs packages
   yum:
    name: "{{ scale_install_all_packages }}"
    state: latest
-   disable_gpg_check: "{{ disable_gpgcheck }}"
+   disable_gpg_check: "{{ scale_disable_gpgcheck }}"

roles/remote_mount/tasks/mount_filesystem.yml

@@ -18,7 +18,7 @@
 - name: scale_remotemount_debug | Storage Cluster | Print the Cluster Information
   debug:
     msg: "{{ owning_cluster_info }}"
-  when: scale_remotemount_debug is true
+  when: scale_remotemount_debug is defined and scale_remotemount_debug | bool
 
 - name: Client Cluster (access) | GET the Cluster Information
   uri:
@@ -36,7 +36,7 @@
 - name: scale_remotemount_debug | Client Cluster | Print the Cluster Information
   debug:
     msg: "{{ access_cluster_info }}"
-  when: scale_remotemount_debug is true
+  when: scale_remotemount_debug is defined and scale_remotemount_debug | bool
 
 - set_fact:
     access_cluster_name: "{{ access_cluster_info.json.cluster.clusterSummary.clusterName }}"
@@ -45,7 +45,7 @@
 - name: scale_remotemount_debug | Print out the Storage and Client Cluster Names
   debug:
     msg: "Access: {{ access_cluster_name }} and Owning: {{ owning_cluster_name }}"
-  when: scale_remotemount_debug is true
+  when: scale_remotemount_debug is defined and scale_remotemount_debug | bool
 
 #
 # When scale_remotemount_forceRun, do some cleanup to properly unmount and remove things
@@ -119,7 +119,7 @@
 - name: scale_remotemount_debug | Print out the Client Cluster (access) Public Key results
   debug:
     var: accesskey_result
-  when: scale_remotemount_debug is true
+  when: scale_remotemount_debug is defined and scale_remotemount_debug | bool
 
 - name: Storage Cluster (owner) | Send the Public Key of the Client Cluster (access)
   uri:
@@ -172,7 +172,7 @@
 - name: scale_remotemount_debug | Print out the Storage Cluster (owing) Public Key results
   debug:
     var: owningkey_result
-  when: scale_remotemount_debug is true
+  when: scale_remotemount_debug is defined and scale_remotemount_debug | bool
 
 - name: Step 3
   debug:
@@ -191,7 +191,7 @@
 - name: scale_remotemount_debug | Print out the remote clusters
   debug:
     msg: "{{ remote_clusters_result.json }}"
-  when: scale_remotemount_debug is true
+  when: scale_remotemount_debug is defined and scale_remotemount_debug | bool
 
 # The remote_clusters_results is in an array, so looping here incase there are multiple remote clusters
 # We want to delete the one where the owningCluster name matches what we are trying to do a remote mount on
@@ -223,7 +223,7 @@
 - name: scale_remotemount_debug | Print out the array storing the nodes in the Storage Cluster (owning)
   debug:
     msg: "{{ owning_nodes_name }}"
-  when: scale_remotemount_debug is true
+  when: scale_remotemount_debug is defined and scale_remotemount_debug | bool
 
 - name: Client Cluster (access) | Add Storage Cluster as a Remote Cluster
   uri:

roles/scale_ece/node/tasks/yum/install.yml

@@ -1,15 +1,6 @@
 ---
-- name: Initialize
-  set_fact:
-    disable_gpgcheck: "no"
-
-- name: Disable gpg check
-  set_fact:
-    disable_gpgcheck: "yes"
-  when: scale_version < '5.0.4.0'
-
 - name: install | Install GPFS gnr packages
   yum:
    name: "{{ scale_install_all_packages }}"
    state: present
-   disable_gpg_check: "{{ disable_gpgcheck }}"
+   disable_gpg_check: "{{ scale_disable_gpgcheck }}"

roles/scale_ece/upgrade/tasks/yum/install.yml

@@ -1,25 +1,15 @@
 ---
-- name: Initialize
-  set_fact:
-    disable_gpgcheck: "no"
-
-- name: Disable gpg check
-  set_fact:
-    disable_gpgcheck: "yes"
-  when: scale_version < '5.0.4.0'
-
 - name: upgrade | Upgrade GPFS gnr packages
   yum:
     name: "{{ scale_install_all_packages }}"
     state: latest
     update_only: yes
-    disable_gpg_check: "{{ disable_gpgcheck }}"
+    disable_gpg_check: "{{ scale_disable_gpgcheck }}"
   when: ansible_pkg_mgr == 'yum'
 
-
 - name: upgrade | Upgrade GPFS gnr packages
   package:
     name: "{{ scale_install_all_packages }}"
     state: latest
-    disable_gpg_check: "{{ disable_gpgcheck }}"
+    disable_gpg_check: "{{ scale_disable_gpgcheck }}"
   when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version >= '8'