From b6853cfbe19ca0ef6191f83417f5313cd428f6e7 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 18 Feb 2014 13:48:26 -0500 Subject: [PATCH] Fix display of group attributes Something still seems off about it, but it is self contained to attributes plugin for now. --- plugins/configuration/attributes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/configuration/attributes.py b/plugins/configuration/attributes.py index 46749bb2..50cde64e 100644 --- a/plugins/configuration/attributes.py +++ b/plugins/configuration/attributes.py @@ -21,18 +21,18 @@ def retrieve_nodegroup(nodegroup, element, configmanager, inputdata): if attribute == 'groups': continue if attribute in grpcfg: - val = grpcfg[attribute]['value'] + val = grpcfg[attribute] else: - val = None + val = {'value': None} if attribute.startswith('secret.'): yield msg.CryptedAttributes( - kv={attribute: None}, + kv={attribute: val}, desc=allattributes.node[attribute]['description']) elif isinstance(val, list): raise Exception("TODO") else: yield msg.Attributes( - kv={attribute: val}, + kv={attribute: val['value']}, desc=allattributes.node[attribute]['description']) if element == 'current': for attribute in sorted(grpcfg.iterkeys()):