From 5ab1c4f8543e10649aa91dfef47920be548f267e Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 22 Jan 2023 14:49:30 +0100 Subject: salt.master: manage formulas Signed-off-by: Georg Pfuetzenreuter --- pillar/role/salt/master.sls | 6 +++++- salt/profile/salt/master.sls | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3