summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pillar/role/salt/master.sls6
-rw-r--r--salt/profile/salt/master.sls7
2 files changed, 12 insertions, 1 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls
index 7464f8c..9982a24 100644
--- a/pillar/role/salt/master.sls
+++ b/pillar/role/salt/master.sls
@@ -1,3 +1,5 @@
+{%- set formulas = ['salt-formula'] -%}
+
salt:
interface: ${'secret_salt:master:interface'}
master_remove_config: True
@@ -17,7 +19,9 @@ salt:
- git
file_roots:
production:
- - /srv/formulas/salt-formula
+ {%- for formula in formulas %}
+ - /srv/formulas/{{ formula }}
+ {%- endfor %}
gitfs_root: salt
gitfs_remotes:
- https://git.com.de/LibertaCasa/salt.git:
diff --git a/salt/profile/salt/master.sls b/salt/profile/salt/master.sls
index 5c61e06..a1ef840 100644
--- a/salt/profile/salt/master.sls
+++ b/salt/profile/salt/master.sls
@@ -34,6 +34,13 @@ salt_master_extension_modules_bins:
- require:
- file: salt_master_extension_modules_dirs
+salt_master_formulas:
+ git.latest:
+ - name: https://git.com.de/LibertaCasa/salt-formulas.git
+ - target: /srv/formulas
+ - branch: production
+ - submodules: True
+
salt_master_extra_packages:
pkg.installed:
- names: