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

Implement lastest suggestions from nico, rename ENV Variable to

Browse source 
CDIST_ORDER_DEPENDENCY
This commit is contained in:
Daniel Heule 2014-02-06 15:26:17 +01:00
commit 51afca5336
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cdist/emulator.py
View file

@ -189,9 +189,8 @@ class Emulator(object):
def record_requirements(self): def record_requirements(self):
"""record requirements""" """record requirements"""
#from pudb import set_trace; set_trace();
if "EXECUTE_TYPES_IN_CREATION_ORDER" in self.env and self.env['EXECUTE_TYPES_IN_CREATION_ORDER'] == 'true': if "CDIST_ORDER_DEPENDENCY" in self.env:
# load object name created bevor this one from typeorder file ... # load object name created bevor this one from typeorder file ...
with open(self.typeorder_path, 'r') as typecreationfile: with open(self.typeorder_path, 'r') as typecreationfile:
typecreationorder = typecreationfile.readlines() typecreationorder = typecreationfile.readlines()
@ -202,7 +201,7 @@ class Emulator(object):
self.env['require'] += " " + lastcreatedtype self.env['require'] += " " + lastcreatedtype
else: else:
self.env['require'] = lastcreatedtype self.env['require'] = lastcreatedtype
self.log.debug("Injecting require for EXECUTE_TYPES_IN_CREATION_ORDER: %s for %s", lastcreatedtype, self.cdist_object.name) self.log.debug("Injecting require for CDIST_ORDER_DEPENDENCY: %s for %s", lastcreatedtype, self.cdist_object.name)
except IndexError: except IndexError:
# if no second last line, we are on the first type, so do not set a requirement # if no second last line, we are on the first type, so do not set a requirement
pass pass

8
docs/man/man7/cdist-manifest.text
View file

@ -142,19 +142,19 @@ into an undefined situation.
THIS IS A BETA FEATURE AND MAY BE REMOVED AT ANY TIME. THIS IS A BETA FEATURE AND MAY BE REMOVED AT ANY TIME.
EXECUTE_TYPES_IN_CREATION_ORDER is a EXPERIMENTAL FEATURE ! CDIST_ORDER_DEPENDENCY is a EXPERIMENTAL FEATURE !
You can tell cdist to execute all types in the order in which they are created You can tell cdist to execute all types in the order in which they are created
in the manifest by exporting EXECUTE_TYPES_IN_CREATION_ORDER with the value true. in the manifest by exporting CDIST_ORDER_DEPENDENCY.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
# Tells cdist to execute all types in the order in which they are created ... # Tells cdist to execute all types in the order in which they are created ...
export EXECUTE_TYPES_IN_CREATION_ORDER=true export CDIST_ORDER_DEPENDENCY=on
__sample_type 1 __sample_type 1
require="__some_type_somewhere/id" __sample_type 2 require="__some_type_somewhere/id" __sample_type 2
__example_type 23 __example_type 23
# Now this types are executed in the creation order until the variable is unset # Now this types are executed in the creation order until the variable is unset
unset EXECUTE_TYPES_IN_CREATION_ORDER unset CDIST_ORDER_DEPENDENCY
# all now following types cdist makes the order .. # all now following types cdist makes the order ..
__not_in_order_type 42 __not_in_order_type 42