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

use new call to object lists in absolute path

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-07 16:18:38 +02:00
parent a25ef7f0e8
commit ea402fc0c5
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/cdist/config_install.py
View file

@ -232,7 +232,7 @@ class ConfigInstall:
def stage_run(self): def stage_run(self):
"""The final (and real) step of deployment""" """The final (and real) step of deployment"""
log.info("Generating and executing code") log.info("Generating and executing code")
for cdist_object in cdist.core.Object.list_objects(): for cdist_object in cdist.core.Object.list_objects(self.context.object_base_path):
log.debug("Run object: %s", cdist_object) log.debug("Run object: %s", cdist_object)
self.object_run(cdist_object) self.object_run(cdist_object)
@ -247,8 +247,6 @@ class ConfigInstall:
self.deploy_to() self.deploy_to()
self.cleanup() self.cleanup()
####FIXED ######################################################################
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.link_emulator() self.link_emulator()
@ -261,7 +259,7 @@ class ConfigInstall:
new_objects_created = True new_objects_created = True
while new_objects_created: while new_objects_created:
new_objects_created = False new_objects_created = False
for cdist_object in cdist.core.Object.list_objects(): for cdist_object in cdist.core.Object.list_objects(self.context.object_base_path):
if cdist_object.prepared: if cdist_object.prepared:
log.debug("Skipping rerun of object %s", cdist_object) log.debug("Skipping rerun of object %s", cdist_object)
continue continue