From c042e3097e3f7b22615d6c8f6b219911614e2ba5 Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Thu, 1 Nov 2012 16:03:58 -0600 Subject: [PATCH] use new pillar components in status.custom --- salt/modules/status.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/salt/modules/status.py b/salt/modules/status.py index 590bdeb963..3739d1a2ce 100644 --- a/salt/modules/status.py +++ b/salt/modules/status.py @@ -82,14 +82,12 @@ def custom(): salt '*' status.custom ''' ret = {} - for opt in __opts__: - keys = opt.split('.') - if keys[0] != 'status': - continue - func = '{0}()'.format(keys[1]) + conf = __salt__['config.dot_vals']('status') + for key, val in conf.items(): + func = '{0}()'.format(key.split('.')[1]) vals = eval(func) - for item in __opts__[opt]: + for item in val: ret[item] = vals[item] return ret