valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed special branch from '_' to '__env__'

Browse Source
This commit is contained in:
Kees Bos 2014-11-21 17:37:47 +01:00
parent 3e4d50cea9
commit 3731d76e06
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/pillar/git_pillar.py
View File

@ -17,7 +17,7 @@ to look for Pillar files (such as ``top.sls``).
The optional ``root`` parameter will be added.
.. versionchanged:: @TBD
The special branch name '_' will be replace by the environment ({{env}})
The special branch name '__env__' will be replace by the environment ({{env}})
Note that this is not the same thing as configuring pillar data using the
:conf_master:`pillar_roots` parameter. The branch referenced in the
@ -166,7 +166,7 @@ class GitPillar(object):
def map_branch(self, branch, opts=None):
opts = __opts__ if opts is None else opts
if branch == '_':
if branch == '__env__':
branch = opts['environment']
if branch == 'base':
branch = opts['gitfs_base']