Last active
July 9, 2019 11:24
-
-
Save sjorge/d717e0bd8a0c5985b6e95ca9c2d9022f to your computer and use it in GitHub Desktop.
salt.grains.mdata
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- /opt/tools/lib/python2.7/site-packages/salt/grains/mdata.py Tue Jul 9 11:24:40 2019 | |
+++ /opt/tools/lib/python2.7/site-packages/salt/grains/mdata.py.fix Tue Jul 9 11:24:07 2019 | |
@@ -63,6 +63,8 @@ | |
return grains | |
for mdata_grain in __salt__['cmd.run'](mdata_list, ignore_retcode=True).splitlines(): | |
+ if mdata_grain.startswith("ERROR:"): | |
+ continue | |
mdata_value = __salt__['cmd.run']('{0} {1}'.format(mdata_get, mdata_grain), ignore_retcode=True) | |
if not mdata_grain.startswith('sdc:'): | |
@@ -89,6 +91,7 @@ | |
'datacenter_name', | |
'hostname', | |
'dns_domain', | |
+ 'alias', | |
] | |
sdc_json_keys = [ | |
'resolvers', | |
@@ -107,6 +110,8 @@ | |
for mdata_grain in sdc_text_keys+sdc_json_keys: | |
mdata_value = __salt__['cmd.run']('{0} sdc:{1}'.format(mdata_get, mdata_grain), ignore_retcode=True) | |
+ if mdata_value.startswith("ERROR:"): | |
+ continue | |
if not mdata_value.startswith('No metadata for '): | |
if 'mdata' not in grains: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment