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

link to emulator in config_install and remove it from emulator

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

19
lib/cdist/config_install.py
View file

@ -37,9 +37,7 @@ CODE_HEADER = "#!/bin/sh -e\n"
class ConfigInstall: class ConfigInstall:
"""Cdist main class to hold arbitrary data""" """Cdist main class to hold arbitrary data"""
def __init__(self, target_host, def __init__(self, target_host, initial_manifest=False,
initial_manifest=False,
home=None,
exec_path=sys.argv[0], exec_path=sys.argv[0],
debug=False): debug=False):
@ -51,7 +49,6 @@ class ConfigInstall:
self.path = cdist.path.Path(self.target_host, self.path = cdist.path.Path(self.target_host,
initial_manifest=initial_manifest, initial_manifest=initial_manifest,
base_dir=home,
debug=debug) debug=debug)
def cleanup(self): def cleanup(self):
@ -84,10 +81,7 @@ class ConfigInstall:
cdist.exec.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=True) cdist.exec.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=True)
output_fd.close() output_fd.close()
def link_emulator(self):
"""Link emulator to types"""
cdist.emulator.link(self.exec_path,
self.path.bin_dir, self.path.list_types())
def run_initial_manifest(self): def run_initial_manifest(self):
"""Run the initial manifest""" """Run the initial manifest"""
@ -208,6 +202,15 @@ class ConfigInstall:
cdist.exec.run_or_fail([remote_remote_code], remote_prefix=True) cdist.exec.run_or_fail([remote_remote_code], remote_prefix=True)
### Cleaned / check functions: Round 1 :-) ################################# ### Cleaned / check functions: Round 1 :-) #################################
def link_emulator(self):
"""Link emulator to types"""
src = os.path.abspath(self.exec_path)
for type in cdist.core.Type.list_types():
log.debug("Linking emulator: %s to %s", source, destination)
dst = os.path.join(self.context.bin_dir, type.name)
# FIXME: handle exception / make it more beautiful
os.symlink(src, dst)
def run_global_explorers(self): def run_global_explorers(self):
"""Run global explorers""" """Run global explorers"""
log.info("Running global explorers") log.info("Running global explorers")

9
lib/cdist/emulator.py
View file

@ -142,12 +142,3 @@ def run(argv):
source_fd.close() source_fd.close()
log.debug("Finished " + type + "/" + object_id + repr(params)) log.debug("Finished " + type + "/" + object_id + repr(params))
def link(exec_path, bin_dir, type_list):
"""Link type names to cdist-type-emulator"""
source = os.path.abspath(exec_path)
for type in type_list:
destination = os.path.join(bin_dir, type)
log.debug("Linking %s to %s", source, destination)
os.symlink(source, destination)