Move Salt-internals to Salt's reclass adapters
The Salt reclass_adapter plugins now hide all the internals and provide
reclass only with the information it needs, without having to make
assumptions about Salt internals.
Signed-off-by: martin f. krafft <madduck@madduck.net>
diff --git a/adapters/salt.in b/adapters/salt.in
index 212368e..380ffe6 100644
--- a/adapters/salt.in
+++ b/adapters/salt.in
@@ -78,15 +78,14 @@
posix.EX_USAGE)
if not node:
- # we want master_tops behaviour
- # so we first hack:
- opts = {'master_tops': {'reclass': options}}
- data = top(salt={}, opts=opts, grains={})
+ reclass_opts = options.copy()
+ del reclass_opts['output']
+ del reclass_opts['pretty_print']
+ data = top(**reclass_opts)
else:
- opts={}; salt={}; grains={}; pillar={}
- data = ext_pillar(opts, salt, grains, pillar,
- options.get('storage_type'),
+ pillar={}
+ data = ext_pillar(node, pillar, options.get('storage_type'),
options.get('inventory_base_uri'),
options.get('nodes_uri'),
options.get('classes_uri'))