nfs_configurations workaround

Author: bertiethorpe

ansible/roles/compute_init/files/compute-init.yml

@@ -193,7 +193,7 @@
         tasks_from: nfs-clients.yml
       when:
         - enable_nfs
-        - nfs_enable.clients | default(item.nfs_enable.clients) | bool
+        - nfs_enable.server | bool or ('nfs_enable' in item and item.nfs_enable.server | bool)
       loop: "{{ nfs_configurations }}"
 
     - name: Manila mounts

environments/common/inventory/group_vars/all/nfs.yml

@@ -24,17 +24,9 @@ nfs_configurations:
     # NB: this is stackhpc.nfs role defaults but are set here to prevent being
     # accidently overriden via default options
     nfs_export_options: 'rw,secure,root_squash'
-    # prevent non-cluster IPs mounting the share:
-    # NB: this is set as default for all shares above but is repeated here
-    # in case nfs_export_clients is overriden
-    nfs_export_clients: "{{ _nfs_node_ips }}"
 
   - comment: Export /exports/cluster from Slurm control node
     nfs_enable:
         server: "{{ inventory_hostname in groups['control'] }}"
         clients: false
     nfs_export: "/exports/cluster"
-    # prevent non-cluster IPs mounting the share:
-    # NB: this is set as default for all shares above but is repeated here
-    # in case nfs_export_clients is overriden
-    nfs_export_clients: "{{ _nfs_node_ips }}"