Browse Source

Set privkey_path in update_fileserver orch

master
Sean Johnson 3 years ago
parent
commit
c973bd601a
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: 9FA15B87469EA850
  1. 5
      saltbox/orchestrator/templates/orch_update_fileserver.j2

5
saltbox/orchestrator/templates/orch_update_fileserver.j2

@ -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:

Loading…
Cancel
Save