paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 06:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet: Remove hardcoding of /root/zulip from puppet path.

Browse Source 
This is an important prerequisite to being able to remove dependence
on the /root/zulip symlink altogether.
This commit is contained in:
Tim Abbott
2017-02-08 11:05:20 -08:00
parent 0e0584aeaa
commit 609082c475
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/zulip-puppet-apply
View File

@@ -29,7 +29,9 @@ include apt
for pclass in re.split(r'\s*,\s*', config.get('machine', 'puppet_classes')): for pclass in re.split(r'\s*,\s*', config.get('machine', 'puppet_classes')):
puppet_config += "include %s\n" % (pclass,) puppet_config += "include %s\n" % (pclass,)
puppet_cmd = ["puppet", "apply", "--modulepath=/root/zulip/puppet", "-e", puppet_config] # We use the puppet configuration from the same Zulip checkout as this script
puppet_module_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "puppet")
puppet_cmd = ["puppet", "apply", "--modulepath", puppet_module_path, "-e", puppet_config]
puppet_cmd += extra_args puppet_cmd += extra_args
if not force: if not force: