feat(config): support options as data structure

Support the passing of arguments to an exported directory using a proper data structure to facilitate a more uniform configuration and to allow users to utilize pillar merging of hosts/options. Signed-off-by: Georg Pfuetzenreuter <[email protected]>
saltstack-formulas · Feb 15, 2024 · a3d755c · a3d755c
1 parent 4f9a8c3
commit a3d755c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/nfs/files/exports b/nfs/files/exports
@@ -3,6 +3,18 @@
 # Your changes will be overwritten.
 ########################################################################
 #
-{% for dir, opts in salt['pillar.get']('nfs:server:exports', {}).items() -%}
+{%- for dir, opts in salt['pillar.get']('nfs:server:exports', {}).items() %}
+{%- if opts is string %}
 {{ dir }} {{ opts }}
-{% endfor -%}
+{%- elif opts is mapping %}
+{{ dir }}
+{%- for host, options in opts.items() -%}
+{{ ' ' ~ host }}(
+{%- if options is iterable and options is not string -%}
+{{ ','.join(options) }}
+{%- else -%}
+{{ options }}
+{%- endif -%})
+{%- endfor -%}
+{%- endif %}
+{%- endfor %}
diff --git a/pillar.example b/pillar.example
@@ -13,6 +13,13 @@ nfs:
       /srv/homes: >-
         hostname1(rw,sync,no_subtree_check)
         hostname2(ro,sync,no_subtree_check)
+      /srv/cats:
+        hostname1:
+          - async
+          - nohide
+        hostname2: rw
+      /srv/dogs:
+        hostname1: nohide
     # FreeBSD specific:
     mountd_flags: -l -S