diff --git a/pillar/devserver/datacubes.sls b/pillar/devserver/datacubes.sls new file mode 100644 --- /dev/null +++ b/pillar/devserver/datacubes.sls @@ -0,0 +1,16 @@ +# ------------------------------------------------------------- +# Salt configuration for Nasqueron servers +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Nasqueron +# License: Trivial work, not eligible to copyright +# ------------------------------------------------------------- + +# ------------------------------------------------------------- +# Datacubes +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +datacubes: + + bak: &default {} + git: *default + t: *default diff --git a/pillar/top.sls b/pillar/top.sls --- a/pillar/top.sls +++ b/pillar/top.sls @@ -62,6 +62,7 @@ - webserver.credentials windriver: + - devserver.datacubes - devserver.ports - devserver.repos - webserver.labs diff --git a/roles/devserver/datacube/init.sls b/roles/devserver/datacube/init.sls --- a/roles/devserver/datacube/init.sls +++ b/roles/devserver/datacube/init.sls @@ -17,11 +17,9 @@ # ZFS # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if salt['node.has']('zfs:pool') %} {% set tank = salt['node.get']("zfs:pool") %} -{% set subdirs = ["bak", "git", "t"] %} {{ tank }}/datacube: zfs.filesystem_present: @@ -29,7 +27,7 @@ mountpoint: /datacube compression: zstd -{% for subdir in subdirs %} +{% for subdir, args in pillar.get("datacubes", {}).items() %} {{ tank }}/datacube/{{ subdir }}: zfs.filesystem_present: - properties: