Skip to content

Commit 966033e

Browse files
committed
fix eessi on isolated networks
1 parent 0cd904f commit 966033e

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed

ansible/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,5 @@ roles/*
9494
!roles/slurm_recompile/**
9595
!roles/nhc/
9696
!roles/nhc/**
97+
!roles/eessi/
98+
!roles/eessi/**

ansible/extras.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
environment: "{{ appliances_remote_environment_vars }}"
3636
gather_facts: false
3737
tasks:
38-
- name: Install and configure EESSI
39-
import_role:
38+
- name: Install / configure EESSI
39+
include_role:
4040
name: eessi
41+
tasks_from: "{{ 'configure.yml' if appliances_mode == 'configure' else 'main.yml' }}"
4142

4243
- name: Setup CUDA
4344
hosts: cuda
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
3+
- name: Add base CVMFS config
4+
community.general.ini_file:
5+
dest: /etc/cvmfs/default.local
6+
section: null
7+
option: "{{ item.key }}"
8+
value: "{{ item.value }}"
9+
no_extra_spaces: true
10+
loop: "{{ cvmfs_config | dict2items }}"
11+
12+
13+
# NOTE: Not clear how to make this idempotent
14+
- name: Ensure CVMFS config is setup
15+
command:
16+
cmd: "cvmfs_config setup"

ansible/roles/eessi/tasks/main.yaml renamed to ansible/roles/eessi/tasks/install.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
23
- name: Download Cern GPG key
34
ansible.builtin.get_url:
45
url: http://cvmrepo.web.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
@@ -31,18 +32,3 @@
3132
# - name: Install EESSI CVMFS config
3233
# dnf:
3334
# name: cvmfs-config-eessi
34-
35-
- name: Add base CVMFS config
36-
community.general.ini_file:
37-
dest: /etc/cvmfs/default.local
38-
section: null
39-
option: "{{ item.key }}"
40-
value: "{{ item.value }}"
41-
no_extra_spaces: true
42-
loop: "{{ cvmfs_config | dict2items }}"
43-
44-
45-
# NOTE: Not clear how to make this idempotent
46-
- name: Ensure CVMFS config is setup
47-
command:
48-
cmd: "cvmfs_config setup"

ansible/roles/eessi/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
3+
- include_tasks: install.yml
4+
- include_tasks: configure.yml

0 commit comments

Comments
 (0)