updated git pillar for saltmaster
This commit is contained in:
parent
5b03e9c3da
commit
c0d27e13d7
3 changed files with 7 additions and 14 deletions
|
@ -1,3 +1,10 @@
|
|||
{%- set branches=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
|
||||
branches:
|
||||
saltmaster:
|
||||
{%- for branch in branches %}
|
||||
- {{branch}}
|
||||
{%- endfor %}
|
||||
|
||||
git:
|
||||
salt:
|
||||
repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
|
||||
|
|
|
@ -1,10 +1,3 @@
|
|||
{%- set os=grains['os'] -%}
|
||||
|
||||
/test:
|
||||
file.managed:
|
||||
- source: salt://roles/maintain/saltmaster/test
|
||||
- template: jinja
|
||||
|
||||
salt-master:
|
||||
{%- if os=="CentOS" or os=="RedHat" %}
|
||||
pkg.installed: []
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
{%- set branches=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split(' ') -%}
|
||||
branches:
|
||||
saltmaster:
|
||||
- a
|
||||
{%- for branch in branches %}
|
||||
- {{branch}}
|
||||
{% endfor %}
|
Loading…
Add table
Reference in a new issue