matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

move run_*_explorers from config_install to core.explorer

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-20 11:10:30 +02:00
parent 9588c5189c
commit 81e4c0a418
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/cdist/config_install.py
View file

@ -77,7 +77,7 @@ class ConfigInstall(object):
def stage_prepare(self): def stage_prepare(self):
"""Do everything for a deploy, minus the actual code stage""" """Do everything for a deploy, minus the actual code stage"""
self.local.link_emulator(self.context.exec_path) self.local.link_emulator(self.context.exec_path)
self.run_global_explorers() self.explorer.run_global_explorers(self.local.global_explorer_out_path)
self.manifest.run_initial_manifest(self.context.initial_manifest) self.manifest.run_initial_manifest(self.context.initial_manifest)
self.log.info("Running object manifests and type explorers") self.log.info("Running object manifests and type explorers")
@ -95,32 +95,10 @@ class ConfigInstall(object):
self.object_prepare(cdist_object) self.object_prepare(cdist_object)
new_objects_created = True new_objects_created = True
def run_global_explorers(self):
"""Run global explorers and save output"""
# FIXME: move to explorer, pass global_explorer_out_path as argument
self.log.info("Running global explorers")
self.explorer.transfer_global_explorers()
for explorer in self.explorer.list_global_explorer_names():
output = self.explorer.run_global_explorer(explorer)
path = os.path.join(self.local.global_explorer_out_path, explorer)
with open(path, 'w') as fd:
fd.write(output)
def run_type_explorers(self, cdist_object):
"""Run type explorers and save output in object."""
self.log.debug("Transfering type explorers for type: %s", cdist_object.type)
self.explorer.transfer_type_explorers(cdist_object.type)
self.log.debug("Transfering object parameters for object: %s", cdist_object.name)
self.explorer.transfer_object_parameters(cdist_object)
for explorer in self.explorer.list_type_explorer_names(cdist_object.type):
output = self.explorer.run_type_explorer(explorer, cdist_object)
self.log.debug("Running type explorer '%s' for object '%s'", explorer, cdist_object.name)
cdist_object.explorers[explorer] = output
def object_prepare(self, cdist_object): def object_prepare(self, cdist_object):
"""Prepare object: Run type explorer + manifest""" """Prepare object: Run type explorer + manifest"""
self.log.info("Running manifest and explorers for " + cdist_object.name) self.log.info("Running manifest and explorers for " + cdist_object.name)
self.run_type_explorers(cdist_object) self.explorer.run_type_explorers(cdist_object)
self.manifest.run_type_manifest(cdist_object) self.manifest.run_type_manifest(cdist_object)
cdist_object.state = core.Object.STATE_PREPARED cdist_object.state = core.Object.STATE_PREPARED