From a3cc1c5c9ae263c7a32f723cf60b459c93e577b5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 16 Sep 2016 11:15:14 -0500 Subject: [PATCH] Make sure environment winds up in basemodulepath Change-Id: I7a80158fef3fd764000f7d57a56ebf0df83347ea --- defaults/main.yml | 3 ++- templates/environment.conf.j2 | 2 +- templates/puppet.conf.j2 | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d8c426d..5dbb131 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,7 +10,8 @@ puppet_server: puppet certname: "{{ ansible_fqdn }}" puppet_data_binding_terminus: hiera puppet_reports: store -puppet_basemodulepath: '$confdir/modules:/opt/system-config/production/modules' +puppet_basemodulepath: '$confdir/modules' puppet_environmentpath: '$confdir/environments' puppet_hiera_datadir: '/opt/system-config/' +puppet_environment_basedir: '/opt/system-config/' puppet_environment: production diff --git a/templates/environment.conf.j2 b/templates/environment.conf.j2 index 0e63665..7726473 100644 --- a/templates/environment.conf.j2 +++ b/templates/environment.conf.j2 @@ -1 +1 @@ -modulepath = {{ puppet_basemodulepath }} +modulepath = '{{ puppet_basemodulepath }}:{{ puppet_environment_basedir }}{{ puppet_environment }}/modules' diff --git a/templates/puppet.conf.j2 b/templates/puppet.conf.j2 index 93883b3..4e48051 100644 --- a/templates/puppet.conf.j2 +++ b/templates/puppet.conf.j2 @@ -8,7 +8,7 @@ certname={{ certname }} pluginsync=true data_binding_terminus={{ puppet_data_binding_terminus }} reports={{ puppet_reports }} -basemodulepath={{ puppet_basemodulepath }} +basemodulepath = {{ puppet_basemodulepath }} environmentpath={{ puppet_environmentpath }} environmenttimeout=0