From 74a5c3ad15fd0df753924e9fdb2d0cb7ea9d195b Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Sat, 12 Sep 2020 10:51:01 +0000
Subject: [PATCH] lifting lustre client to centos78. Lustre module from our
 repo needs mlx kmod

---
 CICD/plays/testlustre/testlustre.yml  | 10 +++++++---
 CICD/plays/testlustre/vars            |  2 +-
 roles/mellanox_drivers/tasks/main.yml |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CICD/plays/testlustre/testlustre.yml b/CICD/plays/testlustre/testlustre.yml
index 26553931..6011c7aa 100644
--- a/CICD/plays/testlustre/testlustre.yml
+++ b/CICD/plays/testlustre/testlustre.yml
@@ -93,11 +93,15 @@
       state: mounted
 
 - hosts: 'LoginNodes' # this does not work. we need to config_repos first
-#  vars_files: 
-#    - vars/vars.yml 
+  tasks:
+  - include_vars: vars/vars_centos78.yml
+
+- hosts: 'LoginNodes'
   roles:
   - { role: config_repos, tags: [ repos ] }
-    
+  - { role: upgrade, tags: [ upgrade ] } # upgrade from centos7.6 base image to centos7.8
+  - { role: mellanox_drivers, start_roce_service: false }
+  
 - hosts: 'LoginNodes' # this does not work. we need to config_repos first
   tasks:
   - name: install rpms
diff --git a/CICD/plays/testlustre/vars b/CICD/plays/testlustre/vars
index e8d9a642..8559d2e0 120000
--- a/CICD/plays/testlustre/vars
+++ b/CICD/plays/testlustre/vars
@@ -1 +1 @@
-../vars
\ No newline at end of file
+../../vars
\ No newline at end of file
diff --git a/roles/mellanox_drivers/tasks/main.yml b/roles/mellanox_drivers/tasks/main.yml
index 1b7f5858..88fc029d 100644
--- a/roles/mellanox_drivers/tasks/main.yml
+++ b/roles/mellanox_drivers/tasks/main.yml
@@ -147,4 +147,5 @@
 
 - name: enable roce_mode setting
   service: name=roce_mode state=started enabled=yes
-  become: true
\ No newline at end of file
+  become: true
+  when: start_roce_service is undefined or start_roce_service is true
-- 
GitLab