summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2016-09-16 23:45:36 +0200
committerMonty Taylor <mordred@inaugust.com>2016-10-01 08:11:13 -0700
commite7a06ed55aeac0c09e09bbdade010b9c45c855ce (patch)
tree1f8bd6a28919f0f7657740917289fab70d51ef43
parent1c69c305e7fc25e608cd05a0c0970ad1f156d8b6 (diff)
Remove basemodulepath from environment config
We want the env specific modules to be used first then fall back onto the normal base module path for any modules missing from the environment. This means you can test local changes without having a complete set of modules in your env. Change-Id: I2f0311400a8cf76b9793f50453e818ed4dd7e5a2
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 04 Oct 2016 21:18:38 +0000 Reviewed-on: https://review.openstack.org/371812 Project: openstack-infra/ansible-role-puppet Branch: refs/heads/master
-rw-r--r--templates/environment.conf.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/environment.conf.j2 b/templates/environment.conf.j2
index 7726473..bbdf964 100644
--- a/templates/environment.conf.j2
+++ b/templates/environment.conf.j2
@@ -1 +1 @@
modulepath = '{{ puppet_basemodulepath }}:{{ puppet_environment_basedir }}{{ puppet_environment }}/modules' modulepath = '{{ puppet_environment_basedir }}{{ puppet_environment }}/modules'