Skip to content

Commit 9f0a816

Browse files
authored
Merge pull request #27 from pescobar/add_ansible_requirements_file
added ansible requirements.yml and update README
2 parents b5cf489 + c00f414 commit 9f0a816

File tree

11 files changed

+18
-38
lines changed

11 files changed

+18
-38
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
hosts
2+
roles/

.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
[submodule "roles/galaxyproject.cvmfs"]
2-
path = roles/cvmfs
3-
url = https://github.com/galaxyproject/ansible-cvmfs
4-
[submodule "roles/geerlingguy.repo-epel"]
5-
path = roles/geerlingguy.repo-epel
6-
url = https://github.com/geerlingguy/ansible-role-repo-epel

README.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,11 @@ and needs to be able to use privilege escalation (e.g. `sudo`) on those machines
3030

3131
For the installation of all components we make use of two Ansible roles: the CVMFS installation role provided by the Galaxy project (see
3232
https://github.com/galaxyproject/ansible-cvmfs), and a role for adding the EPEL repository (https://github.com/geerlingguy/ansible-role-repo-epel).
33-
Both repositories are added as a submodule inside the `roles` directory, so make sure to use the `--recursive` option when cloning this repository:
34-
```
35-
git clone --recursive https://github.com/EESSI/filesystem-layer.git
36-
```
37-
Alternatively, clone this repository first, and init and update the required submodules later:
33+
34+
To download the dependency roles do:
3835
```
39-
git clone https://github.com/EESSI/filesystem-layer.git
40-
cd filesystem-layer
41-
git submodule init
42-
git submodule update
36+
ansible-galaxy role install -r requirements.yml -p ./roles
4337
```
44-
For more information about (working with) submodules, see:
45-
https://git-scm.com/book/en/v2/Git-Tools-Submodules
4638

4739
### Configuration
4840

client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
vars:
66
eessi_cvmfs_repos_enabled: config-repo
77
roles:
8-
- cvmfs
8+
- galaxyproject.cvmfs

localproxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
vars:
66
cvmfs_squid_conf_src: eessi_localproxy_squid.conf.j2
77
roles:
8-
- cvmfs
8+
- galaxyproject.cvmfs

requirements.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
3+
# ansible-galaxy role install -r requirements.yml -p ./roles
4+
roles:
5+
6+
- name: galaxyproject.cvmfs
7+
version: 0.2.10
8+
9+
- name: geerlingguy.repo-epel
10+
version: 1.3.0

roles/README.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

roles/cvmfs

Lines changed: 0 additions & 1 deletion
This file was deleted.

roles/geerlingguy.repo-epel

Lines changed: 0 additions & 1 deletion
This file was deleted.

stratum0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
roles:
88
- role: geerlingguy.repo-epel
99
when: ansible_facts['os_family'] == 'RedHat'
10-
- cvmfs
10+
- galaxyproject.cvmfs

0 commit comments

Comments
 (0)