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

diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml
index 70baeb6..a83e0cf 100644 (file)
--- 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:

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index c3dd403..6416c43 100644 (file)
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -37,6 +37,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:

diff --git a/puppet/compute-post.yaml b/puppet/compute-post.yaml
index c1b3777..d0c6082 100644 (file)
--- a/puppet/compute-post.yaml
+++ b/puppet/compute-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:

diff --git a/puppet/controller-config-pacemaker.yaml b/puppet/controller-config-pacemaker.yaml
index 5116cac..b313f5d 100644 (file)
--- 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:

diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml
index cadba70..811c544 100644 (file)
--- a/puppet/controller-config.yaml
+++ b/puppet/controller-config.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:

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 306a4d6..859fad2 100644 (file)
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -36,6 +36,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: