valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use roles instread of salt:roles mdata entry

Browse Source
This commit is contained in:
Jorge Schrauwen 2016-01-31 20:49:25 +00:00
parent 3dea383a9e
commit d3f5c7066b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/grains/core.py
View File

@ -2036,7 +2036,7 @@ def _smartos_zone_data():
for mdata_grain in __salt__['cmd.run']('mdata-list').splitlines():
grain_data = __salt__['cmd.run']('mdata-get {0}'.format(mdata_grain))
if mdata_grain == 'salt:roles': # parse salt:roles as roles grain
if mdata_grain == 'roles': # parse roles as roles grain
grain_data = grain_data.split(',')
grains['roles'] = grain_data
else: # parse other grains into mdata