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

allow manifest to return env for usage from external

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-11-06 22:32:18 +01:00
commit 6482863c5d
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cdist/core/manifest.py
View file

@ -78,21 +78,23 @@ class Manifest(object):
self.env.update({'__cdist_debug': "yes" }) self.env.update({'__cdist_debug': "yes" })
def run_initial_manifest(self, script): def env_initial_manifest(self, script):
env = os.environ.copy() env = os.environ.copy()
env.update(self.env) env.update(self.env)
env['__manifest'] = self.local.manifest_path env['__manifest'] = self.local.manifest_path
env['__cdist_manifest'] = script env['__cdist_manifest'] = script
return env
def run_initial_manifest(self, script):
self.log.info("Running initial manifest " + self.local.manifest_path) self.log.info("Running initial manifest " + self.local.manifest_path)
if not os.path.isfile(self.local.manifest_path): if not os.path.isfile(self.local.manifest_path):
raise cdist.Error("Initial manifest is missing") raise cdist.Error("Initial manifest is missing")
self.local.run_script(script, env=env) self.local.run_script(script, env=self.env_initial_manifest(script))
def run_type_manifest(self, cdist_object): def env_type_manifest(self, cdist_object):
script = os.path.join(self.local.type_path, cdist_object.cdist_type.manifest_path)
if os.path.isfile(script):
env = os.environ.copy() env = os.environ.copy()
env.update(self.env) env.update(self.env)
env.update({ env.update({
@ -103,4 +105,10 @@ class Manifest(object):
'__type': cdist_object.cdist_type.absolute_path, '__type': cdist_object.cdist_type.absolute_path,
'__cdist_manifest': script, '__cdist_manifest': script,
}) })
self.local.run_script(script, env=env)
return env
def run_type_manifest(self, cdist_object):
script = os.path.join(self.local.type_path, cdist_object.cdist_type.manifest_path)
if os.path.isfile(script):
self.local.run_script(script, env=self.env_type_manifest(cdist_object))