Merge pull request #483 from IBM/dev

Dev ==> Master

Author: rajan-mis

README.md

@@ -55,7 +55,7 @@ Features
 - [x] Configure client and server license
 - [x] Assign default quorum (maximum 7 quorum nodes) if user has not defined in the inventory
 - [x] Assign default manager nodes(all nodes will act as manager node) if user has not defined in the inventory
-- [x] Create new cluster (mmcrcluster -N /var/tmp/NodeFile -C {{ scale_cluster_clustername }})
+- [x] Create new cluster (mmcrcluster -N /var/mmfs/tmp/NodeFile -C {{ scale_cluster_clustername }})
 - [x] Create cluster with profiles
 - [x] Create Cluster with daemon and admin network
 - [x] Add new node into existing cluster
@@ -330,7 +330,7 @@ Furthermore, upgrades are not currently in scope of this role. Spectrum Scale su
 Troubleshooting
 ---------------
 
-The roles in this project store configuration files in `/var/tmp` on the first host in the play. These configuration files are kept to determine if definitions have changed since the previous run, and to decide if it's necessary to run certain Spectrum Scale commands (again). When experiencing problems one can simply delete these configuration files from `/var/tmp` in order to clear the cache — doing so forces re-application of all definitions upon the next run. As a downside, the next run may take longer than expected as it might re-run unnecessary Spectrum Scale commands. This will automatically re-generate the cache.
+The roles in this project store configuration files in `/var/mmfs/tmp` on the first host in the play. These configuration files are kept to determine if definitions have changed since the previous run, and to decide if it's necessary to run certain Spectrum Scale commands (again). When experiencing problems one can simply delete these configuration files from `/var/mmfs/tmp` in order to clear the cache — doing so forces re-application of all definitions upon the next run. As a downside, the next run may take longer than expected as it might re-run unnecessary Spectrum Scale commands. This will automatically re-generate the cache.
 
 
 Reporting Issues and Feedback

roles/callhome/node/tasks/install_repository.yml

@@ -4,21 +4,12 @@
 #
 # Configure YUM repository
 #
-- name: install | Initialize
-  set_fact:
-   gpgcheck: "yes"
-
-- name: install | Disable gpg check
-  set_fact:
-   gpgcheck: "no"
-  when: scale_version < '5.0.4.0'
-
 - name: install | Configure Callhome YUM repository
   yum_repository:
     name: spectrum-scale-callhome-rpms
     description: IBM Spectrum Scale (Callhome RPMS)
     baseurl: "{{ scale_install_repository_url }}gpfs_rpms/"
-    gpgcheck: "{{ gpgcheck }}"
+    gpgcheck: "{{ scale_install_gpgcheck }}"
     repo_gpgcheck: no
     sslverify: no
     state: present

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

@@ -1,13 +1,4 @@
 ---
-- name: install | Initialize
-  set_fact:
-    scale_disable_gpgcheck: "no"
-
-- name: install | Disable gpg check
-  set_fact:
-    scale_disable_gpgcheck: "yes"
-  when: scale_version < '5.0.4.0'
-
 - name: install | Install GPFS Callhome packages
   yum:
    name: "{{ scale_install_all_packages }}"

roles/core/cluster/tasks/cluster.yml

@@ -116,7 +116,7 @@
     - name: cluster | Prepare new cluster NodeFile
       template:
         src: NewNodeFile.j2
-        dest: /var/tmp/NodeFile
+        dest: /var/mmfs/tmp/NodeFile
 
     - name: cluster | Stat GPFS profile file
       find:
@@ -149,7 +149,7 @@
         - scale_cluster_config is defined and scale_cluster_config.remote_file_copy is defined
 
     - name: cluster | Create new cluster
-      command: /usr/lpp/mmfs/bin/mmcrcluster -N /var/tmp/NodeFile -C {{ scale_cluster_clustername }} {{ profile_type }} {{ extra_option }}
+      command: /usr/lpp/mmfs/bin/mmcrcluster -N /var/mmfs/tmp/NodeFile -C {{ scale_cluster_clustername }} {{ profile_type }} {{ extra_option }}
       notify: accept-licenses
       register: mmcrcluster_results
 
@@ -158,21 +158,21 @@
 
     - name: cluster | Copy cluster create NodeFile
       copy:
-        src: /var/tmp/NodeFile
+        src: /var/mmfs/tmp/NodeFile
         dest: /usr/lpp/mmfs/
         mode: a+x
         remote_src: yes
       ignore_errors: yes
 
     - name: cluster | Cleanup new cluster NodeFile
       file:
-        path: /var/tmp/NodeFile
+        path: /var/mmfs/tmp/NodeFile
         state: absent
 
     - name: cluster | Prepare new cluster ChangeFile for next run
       template:
         src: ChangeFile.j2
-        dest: /var/tmp/ChangeFile
+        dest: /var/mmfs/tmp/ChangeFile
   when:
     - groups['scale_cluster_candidates'] is defined
     - groups['scale_cluster_members'] is undefined
@@ -186,26 +186,26 @@
     - name: cluster | Prepare existing cluster NodeFile
       template:
         src: AddNodeFile.j2
-        dest: /var/tmp/NodeFile
+        dest: /var/mmfs/tmp/NodeFile
 
     - name: cluster | Add new nodes to cluster
-      command: /usr/lpp/mmfs/bin/mmaddnode -N /var/tmp/NodeFile --accept
+      command: /usr/lpp/mmfs/bin/mmaddnode -N /var/mmfs/tmp/NodeFile --accept
       register: mmadd_results
 
     - debug:
          msg: "{{ mmadd_results.cmd }}"
 
     - name: cluster | Copy Add node NodeFile
       copy:
-        src: /var/tmp/NodeFile
+        src: /var/mmfs/tmp/NodeFile
         dest: /usr/lpp/mmfs/
         mode: a+x
         remote_src: yes
       ignore_errors: yes
 
     - name: cluster | Cleanup existing cluster NodeFile
       file:
-        path: /var/tmp/NodeFile
+        path: /var/mmfs/tmp/NodeFile
         state: absent
   when:
     - groups['scale_cluster_candidates'] is defined

roles/core/cluster/tasks/cluster_start.yml

@@ -47,7 +47,7 @@
     - name: cluster | Prepare existing cluster ChangeFile
       template:
         src: ChangeFile.j2
-        dest: /var/tmp/ChangeFile
+        dest: /var/mmfs/tmp/ChangeFile
       register: scale_cluster_changefile
 
     - block:  ## when: scale_cluster_changefile is changed
@@ -57,7 +57,7 @@
           command: /usr/lpp/mmfs/bin/mmchlicense server --accept -N {{ quorum_nodes | join(',') }}
 
         - name: cluster | Change roles of existing nodes
-          command: /usr/lpp/mmfs/bin/mmchnode -S /var/tmp/ChangeFile
+          command: /usr/lpp/mmfs/bin/mmchnode -S /var/mmfs/tmp/ChangeFile
           notify: accept-licenses
 
       when: scale_cluster_changefile is changed

roles/core/cluster/tasks/config.yml

@@ -38,7 +38,7 @@
         current_nodeclass: "{{ item | regex_replace('^scale_nodeclass_', '') }}"
       template:
         src: NodeClass.j2
-        dest: /var/tmp/NodeClass.{{ current_nodeclass }}
+        dest: /var/mmfs/tmp/NodeClass.{{ current_nodeclass }}
       register: scale_config_nodeclassfile
       with_items: "{{ scale_config_nodeclasses | default([]) }}"
 
@@ -48,7 +48,7 @@
     - name: config | Create new nodeclasses
       vars:
         current_nodeclass: "{{ item.item | regex_replace('^scale_nodeclass_', '') }}"
-      command: /usr/lpp/mmfs/bin/mmcrnodeclass {{ current_nodeclass }} -N /var/tmp/NodeClass.{{ current_nodeclass }}
+      command: /usr/lpp/mmfs/bin/mmcrnodeclass {{ current_nodeclass }} -N /var/mmfs/tmp/NodeClass.{{ current_nodeclass }}
       when:
         - not current_nodeclass in scale_config_existing_nodeclasses.stdout_lines
         - item is changed
@@ -61,7 +61,7 @@
     - name: config | Replace existing nodeclasses
       vars:
         current_nodeclass: "{{ item.item | regex_replace('^scale_nodeclass_', '') }}"
-      command: /usr/lpp/mmfs/bin/mmchnodeclass {{ current_nodeclass }} replace -N /var/tmp/NodeClass.{{ current_nodeclass }}
+      command: /usr/lpp/mmfs/bin/mmchnodeclass {{ current_nodeclass }} replace -N /var/mmfs/tmp/NodeClass.{{ current_nodeclass }}
       when:
         - current_nodeclass in scale_config_existing_nodeclasses.stdout_lines
         - item is changed

roles/core/cluster/tasks/storage.yml

@@ -83,7 +83,7 @@
           "{{ scale_storage_nsddefs | difference(scale_storage_existing_nsds.stdout_lines) }}"
       template:
         src: StanzaFile.j2
-        dest: /var/tmp/StanzaFile.new.{{ current_fs }}
+        dest: /var/mmfs/tmp/StanzaFile.new.{{ current_fs }}
       register: scale_storage_stanzafile_new
       with_items: "{{ scale_storage_fsdefs }}"
 
@@ -95,7 +95,7 @@
     - name: storage | Create new NSDs
       vars:
         verify: "{{ 'no' if scale_storage_fsparams[item.item].overwriteNSDs | default(scale_storage_filesystem_defaults.overwriteNSDs) else 'yes' }}"
-      command: /usr/lpp/mmfs/bin/mmcrnsd -F /var/tmp/StanzaFile.new.{{ item.item }} -v {{ verify }}
+      command: /usr/lpp/mmfs/bin/mmcrnsd -F /var/mmfs/tmp/StanzaFile.new.{{ item.item }} -v {{ verify }}
       when:
         - item.size > 1
       with_items: "{{ scale_storage_stanzafile_new.results }}"
@@ -115,7 +115,7 @@
           "{{ scale_storage_nsddefs }}"
       template:
         src: StanzaFile.j2
-        dest: /var/tmp/StanzaFile.new.{{ current_fs }}
+        dest: /var/mmfs/tmp/StanzaFile.new.{{ current_fs }}
       register: scale_storage_stanzafile_new
       when:
         - current_fs not in scale_storage_existing_fs.stdout_lines
@@ -124,7 +124,7 @@
     - name: storage | Create new filesystem(s)
       command:
         /usr/lpp/mmfs/bin/mmcrfs {{ item.item }}
-        -F /var/tmp/StanzaFile.new.{{ item.item }}
+        -F /var/mmfs/tmp/StanzaFile.new.{{ item.item }}
         -B {{ scale_storage_fsparams[item.item].blockSize | default(scale_storage_filesystem_defaults.blockSize) }}
         -m {{ scale_storage_fsparams[item.item].defaultMetadataReplicas | default(scale_storage_filesystem_defaults.defaultMetadataReplicas) }}
         -r {{ scale_storage_fsparams[item.item].defaultDataReplicas | default(scale_storage_filesystem_defaults.defaultDataReplicas) }}
@@ -155,14 +155,14 @@
           "{{ scale_storage_nsddefs | difference(scale_storage_existing_nsds.stdout_lines) | union(scale_storage_free_nsds.stdout_lines) }}"
       template:
         src: StanzaFile.j2
-        dest: /var/tmp/StanzaFile.new.{{ current_fs }}
+        dest: /var/mmfs/tmp/StanzaFile.new.{{ current_fs }}
       register: scale_storage_stanzafile_new
       when:
         - current_fs in scale_storage_existing_fs.stdout_lines
       with_items: "{{ scale_storage_fsdefs }}"
 
     - name: storage | Extend existing filesystem(s)
-      command: /usr/lpp/mmfs/bin/mmadddisk {{ item.item }} -F /var/tmp/StanzaFile.new.{{ item.item }}
+      command: /usr/lpp/mmfs/bin/mmadddisk {{ item.item }} -F /var/mmfs/tmp/StanzaFile.new.{{ item.item }}
       when:
         - item.item in scale_storage_existing_fs.stdout_lines
         - item.size > 1
@@ -173,7 +173,7 @@
 #
     - name: storage | Cleanup new NSD StanzaFile(s)
       file:
-        path: /var/tmp/StanzaFile.new.{{ item }}
+        path: /var/mmfs/tmp/StanzaFile.new.{{ item }}
         state: absent
       with_items: "{{ scale_storage_fsdefs }}"
 
@@ -188,14 +188,14 @@
           "{{ scale_storage_existing_nsds.stdout_lines }}"
       template:
         src: StanzaFile.j2
-        dest: /var/tmp/StanzaFile.{{ current_fs }}
+        dest: /var/mmfs/tmp/StanzaFile.{{ current_fs }}
       register: scale_storage_stanzafile_existing
       with_items: "{{ scale_storage_fsdefs }}"
 
     - name: storage | Copy temp existing NSD StanzaFile(s)
       copy:
-        src: /var/tmp/StanzaFile.{{ item.item }}
-        dest: /var/tmp/StanzaFile.{{ item.item }}.nsd
+        src: /var/mmfs/tmp/StanzaFile.{{ item.item }}
+        dest: /var/mmfs/tmp/StanzaFile.{{ item.item }}.nsd
         remote_src: true
       when:
         - item.item in scale_storage_existing_fs.stdout_lines
@@ -205,7 +205,7 @@
 
     - name: storage | Filter temp existing NSD StanzaFile(s)
       replace:
-        path: /var/tmp/StanzaFile.{{ item.item }}.nsd
+        path: /var/mmfs/tmp/StanzaFile.{{ item.item }}.nsd
         regexp: ^\s*(usage|failureGroup|pool)=.*\n
       when:
         - item.item in scale_storage_existing_fs.stdout_lines
@@ -220,7 +220,7 @@
         - scale_storage_stanzafile_existing.results | sum(attribute='size') > scale_storage_stanzafile_existing.results | length
 
     - name: storage | Change existing NSDs
-      command: /usr/lpp/mmfs/bin/mmchnsd -F /var/tmp/StanzaFile.{{ item.item }}.nsd
+      command: /usr/lpp/mmfs/bin/mmchnsd -F /var/mmfs/tmp/StanzaFile.{{ item.item }}.nsd
       notify: accept-licenses
       when:
         - item.item in scale_storage_existing_fs.stdout_lines
@@ -235,7 +235,7 @@
 #
     - name: storage | Cleanup temp existing NSD StanzaFile(s)
       file:
-        path: /var/tmp/StanzaFile.{{ item.item }}.nsd
+        path: /var/mmfs/tmp/StanzaFile.{{ item.item }}.nsd
         state: absent
       when:
         - item.item in scale_storage_existing_fs.stdout_lines
@@ -247,7 +247,7 @@
 # Change existing disks
 #
     - name: storage | Change existing disks
-      command: /usr/lpp/mmfs/bin/mmchdisk {{ item.item }} change -F /var/tmp/StanzaFile.{{ item.item }}
+      command: /usr/lpp/mmfs/bin/mmchdisk {{ item.item }} change -F /var/mmfs/tmp/StanzaFile.{{ item.item }}
       when:
         - item.item in scale_storage_existing_fs.stdout_lines
         - item is changed
@@ -265,7 +265,7 @@
           "{{ scale_storage_nsddefs }}"
       template:
         src: StanzaFile.j2
-        dest: /var/tmp/StanzaFile.{{ current_fs }}
+        dest: /var/mmfs/tmp/StanzaFile.{{ current_fs }}
       when: scale_storage_nsddefs | difference(scale_storage_existing_nsds.stdout_lines) | union(scale_storage_free_nsds.stdout_lines) | length > 0
       with_items: "{{ scale_storage_fsdefs }}"
 

roles/core/cluster/tasks/storage_disk.yml

@@ -51,7 +51,7 @@
 #
     - name: storage | Cleanup existing NSD StanzaFile(s)
       file:
-        path: /var/tmp/StanzaFile.new.nsd
+        path: /var/mmfs/tmp/StanzaFile.new.nsd
         state: absent
 
     - name: storage | Prepare StanzaFile(s) for NSD creation
@@ -61,7 +61,7 @@
           "{{ scale_storage_nsddefs | difference(scale_storage_existing_nsds.stdout_lines) }}"
       template:
         src: StanzaFile_nsd.j2
-        dest: /var/tmp/StanzaFile.new.nsd
+        dest: /var/mmfs/tmp/StanzaFile.new.nsd
       register: scale_storage_stanzafile_new
 
     - name: storage | Accept server license for NSD servers
@@ -74,7 +74,7 @@
     - name: storage | Create new NSDs
       vars:
         verify: "{{ 'no' if overwriteNSDs | default(scale_storage_filesystem_defaults.overwriteNSDs) else 'yes' }}"
-      command: /usr/lpp/mmfs/bin/mmcrnsd -F /var/tmp/StanzaFile.new.nsd -v {{ verify }}
+      command: /usr/lpp/mmfs/bin/mmcrnsd -F /var/mmfs/tmp/StanzaFile.new.nsd -v {{ verify }}
       register: scale_nsd_create
       when:
         - scale_storage_stanzafile_new.size > 1
@@ -102,7 +102,7 @@
     #
     - name: storage | Copy NSDs stanza file
       copy:
-        src: /var/tmp/StanzaFile.new.nsd
+        src: /var/mmfs/tmp/StanzaFile.new.nsd
         dest: /usr/lpp/mmfs/
         mode: a+x
         remote_src: yes
@@ -113,7 +113,7 @@
 
     - name: storage | Cleanup new NSD StanzaFile(s)
       file:
-        path: /var/tmp/StanzaFile.new.nsd
+        path: /var/mmfs/tmp/StanzaFile.new.nsd
         state: absent
   run_once: true
   delegate_to: "{{ groups['scale_cluster_admin_nodes'].0 }}"