aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-config-pacemaker.yaml
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2016-08-17 15:18:23 +0200
committerJiri Stransky <jistr@redhat.com>2016-08-17 15:18:23 +0200
commita058beeda4e05b5ce0e2bd99f75f3e2b6bdad31c (patch)
treef04fce2ec62ed82416f5bec0d0f6509f4ce51e7c /puppet/controller-config-pacemaker.yaml
parent0b2829480a299dcba6d5471a99ed76fb92ca31a6 (diff)
Use modulepath for Puppet
We only create the /etc/puppet/modules symlinks during image building, so as we update the openstack-puppet-modules RPM during the lifecycle of a deployment, the symlinks can get out of date and some modules aren't find. This patch adds modulepath for puppet deployments, getting rid of the need for our Puppet modules to be symlinked from /etc/puppet/modules. If there are some already symlinked, they will take precedence. Also modules installed from source to /opt/stack/puppet-modules will take precedence over packaged modules in /usr/share/openstack-puppet/modules. Change-Id: I626a596478be7c55500f9e3c7118ef64ff28aaae Closes-Bug: #1613211
Diffstat (limited to 'puppet/controller-config-pacemaker.yaml')
-rw-r--r--puppet/controller-config-pacemaker.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller-config-pacemaker.yaml b/puppet/controller-config-pacemaker.yaml
index 5116cac..b313f5d 100644
--- a/puppet/controller-config-pacemaker.yaml
+++ b/puppet/controller-config-pacemaker.yaml
@@ -23,6 +23,7 @@ resources:
enable_debug: {get_param: ConfigDebug}
enable_hiera: True
enable_facter: False
+ modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
outputs:
- name: result
config: