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

implement /__object_fq/__object_name/

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-19 15:17:45 +02:00
parent b56925d24a
commit d6cf85e6f6
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/cdist/core/code.py
View file

@ -105,7 +105,8 @@ class Code(object):
'__type': cdist_object.type.absolute_path, '__type': cdist_object.type.absolute_path,
'__object': cdist_object.absolute_path, '__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id, '__object_id': cdist_object.object_id,
'__object_fq': cdist_object.path, '__object_name': cdist_object.name,
'__self': cdist_object.name,
}) })
return self.local.run_script(script, env=env, return_output=True) return self.local.run_script(script, env=env, return_output=True)

4
lib/cdist/core/manifest.py
View file

@ -92,10 +92,10 @@ class Manifest(object):
env = os.environ.copy() env = os.environ.copy()
env.update(self.env) env.update(self.env)
env.update({ env.update({
'__self': cdist_object.name,
'__object': cdist_object.absolute_path, '__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id, '__object_id': cdist_object.object_id,
'__object_fq': cdist_object.name, '__object_name': cdist_object.name,
'__self': cdist_object.name,
'__type': cdist_object.type.absolute_path, '__type': cdist_object.type.absolute_path,
'__cdist_manifest': script, '__cdist_manifest': script,
}) })