From 609082c47500cdb41234d44ccfc43ec1e354192c Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 8 Feb 2017 11:05:20 -0800 Subject: [PATCH] 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. --- scripts/zulip-puppet-apply | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/zulip-puppet-apply b/scripts/zulip-puppet-apply index 8d42de144b..ecf0a67a8a 100755 --- 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: