Improve limitations related to git.latest in salt.formulas (#239)

* Ensure options for formulas `git.latest` are also based on defaults

* Prevent erroneous remote tracking branch modification by `salt.formulas` #238

* Allow multiple envs to use the same gitdir for `salt.formulas`

* Ensure `gitdir` original branch is checked out after formulas `git.latest`

* Fix erroneous comment re: merging in `salt` pillar
This commit is contained in:
myii
2018-06-10 11:18:20 +02:00
committed by Niels Abspoel
parent d2ceaab7dd
commit 91b666c75f
5 changed files with 61 additions and 8 deletions
+3
View File
@@ -351,6 +351,9 @@ salt_formulas:
user: root
group: root
mode: 755
# Explicitly checkout the original branch for repos after the
# git.latest states have been processed (False by default)
checkout_orig_branch: False
# List of formulas to enable in each environment
list:
base: