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

Revert "first generate and execute *-local, then *-remote"

Browse source 
This reverts commit cf22499538266b1b4fac1694254edfd8ba9be68d.
This commit is contained in:
Steven Armstrong 2013-11-26 16:14:44 +01:00
parent f82c4dc669
commit a3dea70a97
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
cdist/config.py
View file

@ -248,30 +248,24 @@ class Config(object):
cdist_type = cdist_object.cdist_type cdist_type = cdist_object.cdist_type
# Generate
self.log.info("Generating and executing code for %s" % (cdist_object.name)) self.log.info("Generating and executing code for %s" % (cdist_object.name))
# local
cdist_object.code_local = self.code.run_gencode_local(cdist_object) cdist_object.code_local = self.code.run_gencode_local(cdist_object)
if cdist_object.code_local:
cdist_object.changed = True
if not self.dry_run:
self.code.run_code_local(cdist_object)
else:
self.log.info("Skipping code execution due to DRY RUN")
# remote
cdist_object.code_remote = self.code.run_gencode_remote(cdist_object) cdist_object.code_remote = self.code.run_gencode_remote(cdist_object)
if cdist_object.code_remote:
cdist_object.changed = True
if not self.dry_run:
self.code.transfer_code_remote(cdist_object)
self.code.run_code_remote(cdist_object)
else:
self.log.info("Skipping code execution due to DRY RUN")
if cdist_object.code_local or cdist_object.code_remote: if cdist_object.code_local or cdist_object.code_remote:
cdist_object.changed = True cdist_object.changed = True
# Execute
if not self.dry_run:
if cdist_object.code_local:
self.code.run_code_local(cdist_object)
if cdist_object.code_remote:
self.code.transfer_code_remote(cdist_object)
self.code.run_code_remote(cdist_object)
else:
self.log.info("Skipping code execution due to DRY RUN")
# Mark this object as done # Mark this object as done
self.log.debug("Finishing run of " + cdist_object.name) self.log.debug("Finishing run of " + cdist_object.name)
cdist_object.state = core.CdistObject.STATE_DONE cdist_object.state = core.CdistObject.STATE_DONE