From 83ebf61e07335e1a5bf250696ffab5e60b1a8123 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 17 Aug 2018 13:27:26 -0500 Subject: [PATCH] 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 --- playbooks/group_vars/puppet.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/playbooks/group_vars/puppet.yaml b/playbooks/group_vars/puppet.yaml index 708fa99ef1..9554e92346 100644 --- a/playbooks/group_vars/puppet.yaml +++ b/playbooks/group_vars/puppet.yaml @@ -3,9 +3,10 @@ copy_hieradata: true copy_puppet: true puppet_reports: none manage_config: true -manifest: /opt/system-config/manifests/site.pp -manifest_base: /opt/system-config -mgmt_manifestpath: /opt/system-config +manifest: /opt/system-config/production/manifests/site.pp +manifest_base: /opt/system-config/production +mgmt_manifestpath: /opt/system-config/ puppet_logdest: syslog mgmt_hieradata: /etc/ansible/hosts mgmt_puppet_module_dir: /etc/puppet/modules +puppet_hieradata_link_dest: /opt/system-config/hieradata