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

make cdist-type-emulator work

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-08 15:52:34 +02:00
parent bf0f2b8f12
commit dbbbf822fe
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/cdist
View file

@ -169,7 +169,7 @@ class Cdist:
log.debug("Linking %s to %s", source, destination) log.debug("Linking %s to %s", source, destination)
os.symlink(source, destination) os.symlink(source, destination)
def global_explore(self): def run_global_explores(self):
"""Run global explorers""" """Run global explorers"""
explorers = self.list_global_explorers() explorers = self.list_global_explorers()
if(len(explorers) == 0): if(len(explorers) == 0):
@ -186,6 +186,7 @@ class Cdist:
self.remote_run_or_fail(cmd, stdout=output_fd) self.remote_run_or_fail(cmd, stdout=output_fd)
output_fd.close() output_fd.close()
# def run_type_explorer(self):
def init_deploy(self): def init_deploy(self):
log.info("Creating clean directory structure") log.info("Creating clean directory structure")
@ -203,9 +204,17 @@ class Cdist:
"""Run the initial manifest""" """Run the initial manifest"""
log.info("Running the initial manifest") log.info("Running the initial manifest")
env = os.environ.copy() env = os.environ.copy()
env['__target_host'] = self.target_host
env['PATH'] = self.bin_dir + ":" + env['PATH'] env['PATH'] = self.bin_dir + ":" + env['PATH']
env['__target_host'] = self.target_host
env['__global'] = self.out_dir
# Legacy stuff to make cdist-type-emulator work
env['__cdist_conf_dir'] = CONF_DIR
env['__cdist_core_dir'] = os.path.join(BASE_DIR, "core")
env['__cdist_local_base_dir'] = self.temp_dir
env['__cdist_manifest'] = self.initial_manifest
self.shell_run_or_debug_fail(self.initial_manifest, self.shell_run_or_debug_fail(self.initial_manifest,
[self.initial_manifest], [self.initial_manifest],
env=env) env=env)
@ -215,7 +224,7 @@ class Cdist:
"""Mimic the old deploy to: Deploy to one host""" """Mimic the old deploy to: Deploy to one host"""
log.info("Deploying to host " + self.target_host) log.info("Deploying to host " + self.target_host)
self.init_deploy() self.init_deploy()
self.global_explore() self.run_global_explores()
self.run_initial_manifest() self.run_initial_manifest()

1
bin/cdist-deploy-to
View file

@ -43,7 +43,6 @@ __cdist_echo info "cdist $__cdist_version: Configuring $__cdist_target_host "
# See cdist-stages(7) # See cdist-stages(7)
# #
cdist-manifest-run-init "$__cdist_target_host"
cdist-object-all "$__cdist_target_host" cdist-object-prepare cdist-object-all "$__cdist_target_host" cdist-object-prepare
cdist-object-all "$__cdist_target_host" cdist-object-run cdist-object-all "$__cdist_target_host" cdist-object-run
cdist-cache "$__cdist_target_host" cdist-cache "$__cdist_target_host"