Merge branch 'dgxdeploy' into 'master'

Dgxdeploy

See merge request hpc-team/ansible_cluster_in_a_box!314

Former-commit-id: d68eb55f

CICD/plays/computenodes.yml

@@ -84,18 +84,13 @@
   vars_files:
   - vars/slurm.yml
   roles:
-  - { role: slurm-common, tags: [ slurm, slurmbuild ] }
   - { role: slurm_config, tags: [ slurm_config, slurm ] }
   - { role: calculateNhcConfig, tags: [ nhc, slurm ] }
   - { role: nhc, tags: [ nhc, slurm ] }
   - { role: slurm-start, start_slurmd: True, tags: [ slurm, slurm-start ] }
   - { role: vncserver, tags: [ other ] }
   - { role: jasons_ssh_ca, tags: [ other ] }
-  - { role: lmod, tags: [ other ] }
   #- { role: extra_packages, tags: [ other, extra_packages ] } # commented because it takes forever! good enough if this gets tested on clusterbuild
-  - { role: enable_modules, default_modules: "modulecmd", tags: [ other ] }
-  - { role: postfix, tags: [ mail, other ] }
-  - { role: set_semaphore_count, tags: [ semaphore ] }
   - { role: telegraf, telegraf_install_rpm_url: 'http://consistency0/src/telegraf-1.12.6-1.x86_64.rpm', tags: [ monitoring,SiteSpecific ] }
 
 - hosts: 'VisNodes'

CICD/tests/ComputeNodes/modules.sh

@@ -7,4 +7,4 @@
 module purge
 module load gcc/8.1.0
 module list
-gcc --version | grep 8.1.0
\ No newline at end of file
+gcc --version | grep 8.1.0

roles/enable_modules/tasks/main.yml

@@ -5,6 +5,7 @@
     name: environment-modules
     state: present
   become: true
+  when: default_modules == "modulecmd"
 
 - name: template lmod bash
   template: src=lmod.sh.j2 dest=/etc/profile.d/lmod.sh

roles/extra_packages/tasks/main.yml

@@ -43,7 +43,8 @@
   with_items: "{{ extra_packages }}"
   become: true
   become_user: root
-  when: ansible_os_family == 'RedHat' 
+  when:
+   - '"CentOS" in ansible_distribution'
   register: result
 
 - name: "Install extra packages from epel only"
@@ -51,7 +52,8 @@
   with_items: "{{ extra_packages_epel }}"
   become: true
   become_user: root
-  when: ansible_os_family == 'RedHat'
+  when:
+   - '"CentOS" in ansible_distribution'
 
 - name: "Show yum install output"
   debug: 

roles/mellanox_drivers/tasks/main.yml

@@ -114,7 +114,6 @@
   - mlnx-ofa_kernel-modules
   when: install_now
 
-
 - name: install drivers
   shell: ./mlnxofedinstall -q --add-kernel-support --force --skip-repo
   args: