romain-dartigues
/
cdist
forked from ungleich-public/cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #169 from arkaitzj/global_explorers 

Make global explorers available to initial manifest
This commit is contained in:
Nico Schottelius 2013-04-09 06:11:07 -07:00
parent 6604c4c4ba 0db80189d7
commit 002537f5d1
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cdist/conf/explorer/hostname
View File

@ -20,6 +20,6 @@
# #
# #
if command -v hostname; then if command -v hostname >/dev/null; then
hostname hostname -f
fi fi

1
cdist/core/manifest.py
View File

@ -106,6 +106,7 @@ class Manifest(object):
env.update(self.env) env.update(self.env)
env['__cdist_manifest'] = initial_manifest env['__cdist_manifest'] = initial_manifest
env['__manifest'] = self.local.manifest_path env['__manifest'] = self.local.manifest_path
env['__explorer'] = self.local.global_explorer_out_path
return env return env

2
docs/man/cdist-reference.text.sh
View File

@ -179,7 +179,7 @@ ENVIRONMENT VARIABLES
--------------------- ---------------------
__explorer:: __explorer::
Directory that contains all global explorers. Directory that contains all global explorers.
Available for: explorer, type explorer Available for: initial manifest, explorer, type explorer
__manifest:: __manifest::
Directory that contains the initial manifest. Directory that contains the initial manifest.
Available for: initial manifest, type manifest Available for: initial manifest, type manifest