From f01d5d39b9caed8777f43bb1229d5ca9a831f41b Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Sat, 12 Sep 2020 21:14:46 +0000
Subject: [PATCH] handling vars in vars_centos78 now

---
 CICD/plays/allnodes.yml    |  1 +
 CICD/plays/mgmtnodes.yml   |  2 ++
 CICD/plays/nfssqlnodes.yml |  1 +
 CICD/vars/vars.yml         | 20 +-------------------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/CICD/plays/allnodes.yml b/CICD/plays/allnodes.yml
index beca31d3..dd901dc0 100644
--- a/CICD/plays/allnodes.yml
+++ b/CICD/plays/allnodes.yml
@@ -19,6 +19,7 @@
   - vars/filesystems.yml
   - vars/slurm.yml
   - vars/vars.yml
+  - vars/vars_centos78.yml
   strategy: free
   roles:
 #  - { role: disable_selinux, tags: [ disableselinux ] }
diff --git a/CICD/plays/mgmtnodes.yml b/CICD/plays/mgmtnodes.yml
index 691b6ff0..c5271339 100644
--- a/CICD/plays/mgmtnodes.yml
+++ b/CICD/plays/mgmtnodes.yml
@@ -10,6 +10,7 @@
   - vars/filesystems.yml
   - vars/slurm.yml
   - vars/vars.yml
+  - vars/vars_centos78.yml
   tasks:
       #  - { name: set hostgroup, set_fact: hostgroup='ManagementNodes' }
   - { name: set use shared state, set_fact: usesharedstatedir=True }
@@ -24,6 +25,7 @@
   - vars/filesystems.yml
   - vars/slurm.yml
   - vars/vars.yml
+  - vars/vars_centos78.yml
   roles:
 #  - { role: ldapclient, tags: [ authentication ] }
 #  - { role: ssh-password-login }
diff --git a/CICD/plays/nfssqlnodes.yml b/CICD/plays/nfssqlnodes.yml
index 9284f832..074b7f25 100644
--- a/CICD/plays/nfssqlnodes.yml
+++ b/CICD/plays/nfssqlnodes.yml
@@ -17,6 +17,7 @@
   - include_vars: vars/filesystems.yml
   - include_vars: vars/slurm.yml
   - include_vars: vars/vars.yml
+  - include_vars: vars/vars_centos78.yml
   - { name: set hostgroup, set_fact: hostgroup='ManagementNodes' }
   - { name: set use shared state, set_fact: usesharedstatedir=True }
   tags: [ always ]
diff --git a/CICD/vars/vars.yml b/CICD/vars/vars.yml
index 5648bc3b..8620f51c 100644
--- a/CICD/vars/vars.yml
+++ b/CICD/vars/vars.yml
@@ -1,25 +1,7 @@
 ---
-#centos77
-LUSTRE_VERSION: 2.13.0-1.el7
-KERNEL_VERSION: 3.10.0-1062.12.1.el7.x86_64
-repopath: centos-staging
-MELLANOX_DRIVER_SRC: "{% if ansible_os_family == 'RedHat'  %}MLNX_OFED_LINUX-4.7-3.2.9.0-rhel7.7-x86_64{% elif ansible_os_family == 'Debian' %}MLNX_OFED_LINUX-3.1-1.0.3-ubuntu14.04-x86_64{% endif %}"
-
-
 sudo_group: systems
 nagios_home: "/var/lib/nagios"
-nvidia_version: "367.134"
-
-yumdisablerepo: 
- - 'base'
- - 'extras'
- - 'updates'
-yumenablerepo: 
- - 'monashhpc_base'
- - 'monashhpc_updates'
- - 'monashhpc_extras'
- - 'monashhpc_centosplus'
- - 'monashhpc_otherstuff'
+nvidia_version: "450.51.06"
 
 gpumap:
  'K1': 'K1'
-- 
GitLab