Page MenuHomeDevCentral

D3087.id7881.diff
No OneTemporary

D3087.id7881.diff

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,19 +17,11 @@
# ZFS
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
{% if salt['node.has']('zfs:pool') %}
{% set tank = salt['node.get']("zfs:pool") %}
-{% set subdirs = ["bak", "git", "t"] %}
-
-{{ tank }}/datacube:
- zfs.filesystem_present:
- - properties:
- mountpoint: /datacube
- compression: zstd
-{% for subdir in subdirs %}
+{% for subdir, args in pillar.get("datacubes", {}) %}
{{ tank }}/datacube/{{ subdir }}:
zfs.filesystem_present:
- properties:

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 07:19 (15 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2259705
Default Alt Text
D3087.id7881.diff (1 KB)

Event Timeline