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

This is an important prerequisite to being able to remove dependence on the /root/zulip symlink altogether.
skapil · Feb 8, 2017 · 609082c · 609082c
1 parent 0e0584a
commit 609082c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/scripts/zulip-puppet-apply b/scripts/zulip-puppet-apply
@@ -29,7 +29,9 @@ include apt
 for pclass in re.split(r'\s*,\s*', config.get('machine', 'puppet_classes')):
     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
 
 if not force: