From a058beeda4e05b5ce0e2bd99f75f3e2b6bdad31c Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Wed, 17 Aug 2016 15:18:23 +0200 Subject: 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 --- puppet/ceph-storage-post.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/ceph-storage-post.yaml') diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml index 70baeb6e..a83e0cfe 100644 --- a/puppet/ceph-storage-post.yaml +++ b/puppet/ceph-storage-post.yaml @@ -38,6 +38,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 inputs: - name: step outputs: -- cgit 1.2.3-korg