Be more explicit about puppet paths

puppet wants the code to be in /opt/system-config/production because of
the environment config. bridge just wants /opt/system-config because
it's an ansible server.

Rather than relying on inferring things, just be explicit about what we
want where.

Depends-On: https://review.openstack.org/593134
Change-Id: I9e749d2c50f7d8a7b0681fe48f38f4741c8a8d01
This commit is contained in:
Monty Taylor 2018-08-17 13:27:26 -05:00
parent a634593a05
commit 83ebf61e07
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594

View File

@ -3,9 +3,10 @@ copy_hieradata: true
copy_puppet: true copy_puppet: true
puppet_reports: none puppet_reports: none
manage_config: true manage_config: true
manifest: /opt/system-config/manifests/site.pp manifest: /opt/system-config/production/manifests/site.pp
manifest_base: /opt/system-config manifest_base: /opt/system-config/production
mgmt_manifestpath: /opt/system-config mgmt_manifestpath: /opt/system-config/
puppet_logdest: syslog puppet_logdest: syslog
mgmt_hieradata: /etc/ansible/hosts mgmt_hieradata: /etc/ansible/hosts
mgmt_puppet_module_dir: /etc/puppet/modules mgmt_puppet_module_dir: /etc/puppet/modules
puppet_hieradata_link_dest: /opt/system-config/hieradata