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

@@ -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