tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

upcoming changes for 2.0.3

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-27 17:27:28 +02:00
commit 26c0d5d9aa
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/changelog
View file

@ -1,3 +1,6 @@
2.0.3:
* Improved logging, added --verbose, by more quiet by default
2.0.2: 2011-09-27 2.0.2: 2011-09-27
* Add support for detection of OpenWall Linux (Matthias Teege) * Add support for detection of OpenWall Linux (Matthias Teege)
* Add support for __debug variable in manifests * Add support for __debug variable in manifests

8
lib/cdist/config.py
View file

@ -123,6 +123,7 @@ class Config:
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.path.initial_manifest)
env = { "__manifest" : self.path.manifest_dir } env = { "__manifest" : self.path.manifest_dir }
self.run_manifest(self.path.initial_manifest, extra_env=env) self.run_manifest(self.path.initial_manifest, extra_env=env)
@ -243,12 +244,13 @@ class Config:
self.run_global_explores() self.run_global_explores()
self.run_initial_manifest() self.run_initial_manifest()
log.info("Running object manifests and type explorers")
old_objects = [] old_objects = []
objects = self.path.list_objects() objects = self.path.list_objects()
# Continue process until no new objects are created anymore # Continue process until no new objects are created anymore
while old_objects != objects: while old_objects != objects:
log.debug("Prepare stage")
old_objects = list(objects) old_objects = list(objects)
for cdist_object in objects: for cdist_object in objects:
if cdist_object in self.objects_prepared: if cdist_object in self.objects_prepared:
@ -263,7 +265,7 @@ class Config:
def stage_run(self): def stage_run(self):
"""The final (and real) step of deployment""" """The final (and real) step of deployment"""
log.debug("Actual run objects") log.info("Generating and executing code")
# Now do the final steps over the existing objects # Now do the final steps over the existing objects
for cdist_object in self.path.list_objects(): for cdist_object in self.path.list_objects():
log.debug("Run object: %s", cdist_object) log.debug("Run object: %s", cdist_object)
@ -306,7 +308,7 @@ def config(args):
if args.parallel: if args.parallel:
for p in process.keys(): for p in process.keys():
log.debug("Joining %s", p) log.debug("Joining process %s", p)
process[p].join() process[p].join()
time_end = datetime.datetime.now() time_end = datetime.datetime.now()