opendev/ansible-role-puppet
Code Issues Proposed changes

Make sure environment winds up in basemodulepath

Browse Source 
Change-Id: I7a80158fef3fd764000f7d57a56ebf0df83347ea
This commit is contained in:
Monty Taylor 2016-09-16 11:15:14 -05:00
parent ede55a8691
commit a3cc1c5c9a
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 4 additions and 3 deletions

3
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

2
templates/environment.conf.j2

@ -1 +1 @@
modulepath = {{ puppet_basemodulepath }}
modulepath = '{{ puppet_basemodulepath }}:{{ puppet_environment_basedir }}{{ puppet_environment }}/modules'

2
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