Skip to content

Commit

Permalink
renamed nfs_mount to nfs_shares
Browse files Browse the repository at this point in the history
  • Loading branch information
XaverStiensmeier committed Oct 29, 2024
1 parent 7ab04de commit f75b357
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bibigrid/core/utility/ansible_configurator.py
Original file line number Diff line number Diff line change
@@ -202,7 +202,7 @@ def generate_common_configuration_yaml(cidrs, configurations, cluster_id, ssh_us
if master_configuration.get("nfs"):
nfs_shares = master_configuration.get("nfsShares", [])
nfs_shares = nfs_shares + DEFAULT_NFS_SHARES
common_configuration_yaml["nfs_mounts"] = [{"src": nfs_share, "dst": nfs_share} for nfs_share in nfs_shares]
common_configuration_yaml["nfs_shares"] = [{"src": nfs_share, "dst": nfs_share} for nfs_share in nfs_shares]
common_configuration_yaml["ext_nfs_mounts"] = [{"src": ext_nfs_share, "dst": ext_nfs_share} for ext_nfs_share in
(master_configuration.get("extNfsShares", []))]

6 changes: 3 additions & 3 deletions resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
name: "nfs-kernel-server"
state: present

- name: Create export directories
- name: Create shared directories
file:
path: "{{ item.src }}"
state: directory
owner: root
group: root
mode: "0o777"
with_items:
- "{{ nfs_mounts }}"
- "{{ nfs_shares }}"

- name: Configure nfs exports
lineinfile:
@@ -24,6 +24,6 @@
{{ '10.0.0.0/'+wireguard.mask_bits|default(24)|string + '(rw,nohide,insecure,no_subtree_check,async)'
if wireguard is defined }}"
with_items:
- "{{ nfs_mounts }}"
- "{{ nfs_shares }}"
notify:
- nfs-server
6 changes: 3 additions & 3 deletions resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml
Original file line number Diff line number Diff line change
@@ -10,15 +10,15 @@
delay: 2
state: started

- name: Create mount points
- name: Create shared directories
file:
path: "{{ item.dst }}"
state: directory
owner: root
group: root
mode: "0o777"
with_items:
- "{{ nfs_mounts }}"
- "{{ nfs_shares }}"

- name: Mount shares
mount:
@@ -27,4 +27,4 @@
fstype: nfs4
state: mounted
with_items:
- "{{ nfs_mounts }}"
- "{{ nfs_shares }}"

0 comments on commit f75b357

Please sign in to comment.