summaryrefslogtreecommitdiffstats
path: root/salt
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-04-29 19:07:32 +0200
committerGeorg Pfuetzenreuter2023-04-29 19:07:32 +0200
commit87bb69fa376ffd78b6e619732c5c921e131b49f8 (patch)
tree970152759b683141ce23a3a700def356925b6deb /salt
parenta6319da8225cee9ddf8263f5b1ff3b310aef2fb4 (diff)
parent76d1da11d9e4ca508696cff123824b6b22a9a500 (diff)
downloadsalt-87bb69fa376ffd78b6e619732c5c921e131b49f8.tar.gz
salt-87bb69fa376ffd78b6e619732c5c921e131b49f8.tar.bz2
salt-87bb69fa376ffd78b6e619732c5c921e131b49f8.zip
Merge pull request 'Split out salt.formulas state' (#44) from profile-formulas into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/44
Diffstat (limited to 'salt')
-rw-r--r--salt/profile/salt/formulas.sls6
-rw-r--r--salt/profile/salt/master.sls8
2 files changed, 7 insertions, 7 deletions
diff --git a/salt/profile/salt/formulas.sls b/salt/profile/salt/formulas.sls
new file mode 100644
index 0000000..d496e68
--- /dev/null
+++ b/salt/profile/salt/formulas.sls
@@ -0,0 +1,6 @@
+salt_master_formulas:
+ git.latest:
+ - name: https://git.com.de/LibertaCasa/salt-formulas.git
+ - target: /srv/formulas
+ - branch: production
+ - submodules: True
diff --git a/salt/profile/salt/master.sls b/salt/profile/salt/master.sls
index f0fdc7c..58f8cc8 100644
--- a/salt/profile/salt/master.sls
+++ b/salt/profile/salt/master.sls
@@ -7,6 +7,7 @@
include:
- salt.master
+ - .formulas
salt_master_extension_modules_dirs:
file.directory:
@@ -34,13 +35,6 @@ 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: