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

Merge remote-tracking branch 'telmich/install' into oo-restructure

Browse source
This commit is contained in:
Steven Armstrong 2011-10-05 16:48:15 +02:00
commit 94d926c0d6
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/cdist/config_install.py
View file

@ -81,6 +81,7 @@ class ConfigInstall:
cdist.exec.run_or_fail(cmd, stdout=output_fd, remote_prefix=self.remote_prefix) cdist.exec.run_or_fail(cmd, stdout=output_fd, remote_prefix=self.remote_prefix)
output_fd.close() output_fd.close()
# FIXME: where to call this from?
def run_type_explorer(self, cdist_object): def run_type_explorer(self, cdist_object):
"""Run type specific explorers for objects""" """Run type specific explorers for objects"""
@ -97,6 +98,7 @@ class ConfigInstall:
# Need to transfer at least the parameters for objects to be useful # Need to transfer at least the parameters for objects to be useful
self.path.transfer_object_parameter(cdist_object) self.path.transfer_object_parameter(cdist_object)
# FIXME: Broken due to refactoring into type.py
explorers = self.path.list_type_explorers(type) explorers = self.path.list_type_explorers(type)
for explorer in explorers: for explorer in explorers:
remote_cmd = cmd + [os.path.join(self.path.remote_type_explorer_dir(type), explorer)] remote_cmd = cmd + [os.path.join(self.path.remote_type_explorer_dir(type), explorer)]
@ -258,6 +260,17 @@ class ConfigInstall:
log.debug("Skipping rerun of object %s", cdist_object) log.debug("Skipping rerun of object %s", cdist_object)
continue continue
else: else:
# FIXME: run_type_explorer:
# object can return type
# type has explorers
# path knows about where to save explorer output
# type = self.path.objects[object].type()
# self.path.types['type'].explorers()
# for explorer in explorers:
# output = cdist.exec.run_debug_or_fail_shell(explorer)
# if output:
# write_output_to(output, os.path.join(self.path.objects[object].explorer_dir(),explorer) )
#
self.run_type_explorer(cdist_object) self.run_type_explorer(cdist_object)
self.run_type_manifest(cdist_object) self.run_type_manifest(cdist_object)
self.objects_prepared.append(cdist_object) self.objects_prepared.append(cdist_object)