Merge remote-tracking branch 'origin/repo_hotfix' into dgxdeploy

CICD/heat/gc_HOT.yaml

@@ -260,7 +260,7 @@ resources:
   ComputeNodeRHEL:
    type: "OS::Heat::ResourceGroup"
    properties:
-    count: 1
+    count: 0
     resource_def:
      type: "OS::Nova::Server"
      properties:

CICD/plays/computenodes.yml

@@ -25,7 +25,7 @@
   - { role: nfs-client, nfsMounts: "{{ computeNfsMounts }}", tags: [ filesystems ] }
   - { role: slurm-common, tags: [ slurm, slurm-common ] }
   - { role: lmod, tags: [ other ] }
-  - { role: enable_modules, default_modules: "lmod", tags: [ other ] }
+  - { role: enable_modules, default_modules: "modulecmd", tags: [ other ] }
   - { role: postfix, tags: [ mail, other ] }
 
 - hosts: 'VisNodes'

CICD/tests/ComputeNodes/modules.sh

+#!/bin/bash
+module purge
+module load gcc/8.1.0
+module list
+gcc --version | grep 8.1.0
+

CICD/tests/LoginNodes/modules.sh

+../ComputeNodes/modules.sh
\ No newline at end of file

roles/enable_modules/tasks/main.yml

 ---
 
+- name: make sure environment modules are installed
+  package:
+    name: environment-modules
+    state: installed
+  become: true
+
 - name: template lmod bash
-  template: src=lmod.sh.j2 dest=/etc/profile.d/lmod.sh 
+  template: src=lmod.sh.j2 dest=/etc/profile.d/lmod.sh
   become: true
   become_user: root
   when: default_modules == "lmod"

roles/sysctl_network/tasks/main.yml

@@ -5,7 +5,7 @@
     dest: '/etc/sysctl.d'
   become: true
   become_user: root
-  register: sysctl-network-conf
+  register: sysctl_network_conf
 
 #The sysctl module manages entries in sysctl.conf and setting "reload :yes" performs a /sbin/sysctl -p if the sysctl file is updated. In addition this module requires a name for a specific sysctl variable in order to work.
 #In this case we need to update the network configuration and making no change to the sysctl.conf file hence the module is not applicable. I am replacing it with a shell module instead.
@@ -13,4 +13,4 @@
   shell: sysctl -p
   become: true
   become_user: root
-  when: sysctl-network-conf.changed
+  when: sysctl_network_conf.changed