Merge pull request #34365 from sjorge/2016.3-fix-broken-smartos-grains

fixes computenode_* grains on SmartOS compute nodes
saltstack · Jun 29, 2016 · 3808d84 · 3808d84
2 parents 65efb55 + 3ff895c
commit 3808d84
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/salt/grains/core.py b/salt/grains/core.py
@@ -1391,8 +1391,8 @@ def os_data():
             uname_v = os.uname()[3]
             grains['os'] = grains['osfullname'] = 'SmartOS'
             grains['osrelease'] = uname_v[uname_v.index('_')+1:]
-        elif salt.utils.is_smartos_globalzone():
-            grains.update(_smartos_computenode_data())
+            if salt.utils.is_smartos_globalzone():
+                grains.update(_smartos_computenode_data())
         elif os.path.isfile('/etc/release'):
             with salt.utils.fopen('/etc/release', 'r') as fp_:
                 rel_data = fp_.read()