|
|
|
@ -1,3 +1,4 @@
|
|
|
|
|
{{ "{% set privkey_path = '%s' %}" | format(salt.pillar.get("saltbox:master:pillar:git_pillar_privkey")) }} |
|
|
|
|
{% raw %} |
|
|
|
|
--- |
|
|
|
|
{% set telegram = salt.pillar.get("telegram") %} |
|
|
|
@ -36,7 +37,7 @@ reset pillar checkout:
|
|
|
|
|
- tgt_type: "grain" |
|
|
|
|
- kwarg: |
|
|
|
|
cwd: /srv/salt/pillars |
|
|
|
|
identity: "{{ salt.pillar.get("saltbox:master:pillar:git_pillar_privkey") }}" |
|
|
|
|
identity: "{{ privkey_path }}" |
|
|
|
|
opts: "--hard origin/master" |
|
|
|
|
|
|
|
|
|
update pillar checkout: |
|
|
|
@ -46,7 +47,7 @@ update pillar checkout:
|
|
|
|
|
- tgt_type: "grain" |
|
|
|
|
- kwarg: |
|
|
|
|
cwd: /srv/salt/pillars |
|
|
|
|
identity: "{{ salt.pillar.get("saltbox:master:pillar:git_pillar_privkey") }}" |
|
|
|
|
identity: "{{ privkey_path }}" |
|
|
|
|
|
|
|
|
|
clear git locks: |
|
|
|
|
salt.runner: |
|
|
|
|