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

prepend hostname in emulator as well

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

1
lib/cdist/config_install.py
View file

@ -150,7 +150,6 @@ class ConfigInstall:
return True return True
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.initial_manifest) log.info("Running initial manifest %s", self.initial_manifest)

5
lib/cdist/emulator.py
View file

@ -34,6 +34,7 @@ def run(argv):
param_path = os.path.join(type_path, "parameter") param_path = os.path.join(type_path, "parameter")
global_path = os.environ['__global'] global_path = os.environ['__global']
object_source = os.environ['__cdist_manifest'] object_source = os.environ['__cdist_manifest']
target_host = os.environ['__target_host']
if '__debug' in os.environ: if '__debug' in os.environ:
logging.root.setLevel(logging.DEBUG) logging.root.setLevel(logging.DEBUG)
@ -68,7 +69,7 @@ def run(argv):
object_id = object_id[1:] object_id = object_id[1:]
# Prefix output by object_self # Prefix output by object_self
logformat = '%(levelname)s: ' + cdist_type + '/' + object_id + ': %(message)s' logformat = '%(levelname)s: ' + target_host + ": " + cdist_type + '/' + object_id + ': %(message)s'
logging.basicConfig(format=logformat) logging.basicConfig(format=logformat)
# FIXME: verify object id # FIXME: verify object id
@ -103,7 +104,7 @@ def run(argv):
value = getattr(args, param) value = getattr(args, param)
if value: if value:
file = os.path.join(param_out_dir, param) file = os.path.join(param_out_dir, param)
log.debug(file + "<-" + param + " = " + value) log.debug(file + " = " + value)
# Already exists, verify all parameter are the same # Already exists, verify all parameter are the same
if object_exists: if object_exists: