moep/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanups/fixes

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-07 15:49:25 +02:00
commit c1e7731992
2 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/cdist/config_install.py
View file

@ -48,15 +48,13 @@ class ConfigInstall:
self.exec_path = exec_path self.exec_path = exec_path
self.context = cdist.context.Context(self.target_host, self.context = cdist.context.Context(self.target_host,
initial_manifest=initial_manifest, base_path=base_path, initial_manifest=initial_manifest,
base_path=base_path,
debug=debug) debug=debug)
def cleanup(self): def cleanup(self):
self.path.cleanup() self.path.cleanup()
def __init_env(self):
"""Setup environment"""
def run_initial_manifest(self): def run_initial_manifest(self):
"""Run the initial manifest""" """Run the initial manifest"""
log.info("Running initial manifest %s", self.context.initial_manifest) log.info("Running initial manifest %s", self.context.initial_manifest)
@ -248,22 +246,15 @@ class ConfigInstall:
self.deploy_to() self.deploy_to()
self.cleanup() self.cleanup()
def init_deploy(self): ####FIXED ######################################################################
"""Ensure the base directories are cleaned up"""
log.debug("Creating clean directory structure")
self.context.remove_remote_path(self.context.remote_base_path)
self.context.remote_mkdir(self.context.remote_base_path)
self.link_emulator()
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.init_deploy() self.link_emulator()
self.run_global_explorers() self.run_global_explorers()
self.run_initial_manifest() self.run_initial_manifest()
log.info("Running object manifests and type explorers") log.info("Running object manifests and type explorers")
log.debug("Searching for objects in " + cdist.core.Object.base_path()) log.debug("Searching for objects in " + cdist.core.Object.base_path())
# Continue process until no new objects are created anymore # Continue process until no new objects are created anymore
@ -281,22 +272,16 @@ class ConfigInstall:
cdist_object.prepared = True cdist_object.prepared = True
new_objects_created = True new_objects_created = True
# FIXME Move into configinstall
def transfer_object_parameter(self, cdist_object): def transfer_object_parameter(self, cdist_object):
"""Transfer the object parameter to the remote destination""" """Transfer the object parameter to the remote destination"""
local_path = src = os.path.join(self.context.object_base_path,
os.path.join(self.context.object_base_path,
cdist_object.parameter_path) cdist_object.parameter_path)
remote_path = dst = os.path.join(self.context.remote_object_path,
os.path.join(self.context.remote_object_path,
cdist_object.parameter_path) cdist_object.parameter_path)
# Synchronise parameter dir afterwards # Synchronise parameter dir afterwards
self.transfer_path(local_path, remote_path) self.transfer_path(local_path, remote_path)
####FIXED ######################################################################
def transfer_global_explorers(self): def transfer_global_explorers(self):
"""Transfer the global explorers""" """Transfer the global explorers"""
self.remote_mkdir(self.context.remote_global_explorer_path) self.remote_mkdir(self.context.remote_global_explorer_path)

8
lib/cdist/context.py
View file

@ -91,7 +91,7 @@ class Context:
# Create directories # Create directories
self.__init_out_paths() self.__init_out_paths()
self.__init_remote_paths()
self.__init_env() self.__init_env()
def cleanup(self): def cleanup(self):
@ -122,6 +122,12 @@ class Context:
os.mkdir(self.global_explorer_out_path) os.mkdir(self.global_explorer_out_path)
os.mkdir(self.bin_path) os.mkdir(self.bin_path)
def __init_remote_paths(self):
"""Initialise remote directory structure"""
self.remove_remote_path(self.remote_base_path)
self.remote_mkdir(self.remote_base_path)
def remote_mkdir(self, directory): def remote_mkdir(self, directory):
"""Create directory on remote side""" """Create directory on remote side"""
cdist.exec.run_or_fail(["mkdir", "-p", directory], remote_prefix=True) cdist.exec.run_or_fail(["mkdir", "-p", directory], remote_prefix=True)