path: root/extraconfig
diff options
authorSofer Athlan-Guyot <sathlang@redhat.com>2017-04-20 12:30:46 +0200
committerAthlan-Guyot sofer <sathlang@redhat.com>2017-04-20 16:45:23 +0000
commit225cff330067b65b5a8b990aeca3424c2b6e1119 (patch)
treef5f1a9ddea6a7c166f843e07da7164880fe374d8 /extraconfig
parent0b45668ffc401c98740102662f4a73a88f684f98 (diff)
N->O Manual puppet commands have the right modulepath.
In two places during upgrade we manually trigger puppet. There can be a problem when new puppet modules are added, and their corresponding symlinks in /etc/puppet/modules are not created during the installation as their are installed in /usr/share/openstack-puppet/modules. To prevent the issue tripleo set modulepath in the templates. We must use the same modulepath to make sure that we don't fail because of missing module in the manual puppet run. This particulary happens when you upgrade from M->N->O, as the base image in Mitaka doesn't have the proper symlinks and they are not created during the installation of the package. Closes-Bug: #1684587 Change-Id: I79df6ea33f1c58e13309176a6de41b7572541fd6 (cherry picked from commit 79c2d0f3d411da9e57731d9da79d25a3e0364eb2)
Diffstat (limited to 'extraconfig')
1 files changed, 4 insertions, 1 deletions
diff --git a/extraconfig/tasks/run_puppet.sh b/extraconfig/tasks/run_puppet.sh
index b7771e33..e3f6c493 100755
--- a/extraconfig/tasks/run_puppet.sh
+++ b/extraconfig/tasks/run_puppet.sh
@@ -10,7 +10,10 @@ function run_puppet {
export FACTER_deploy_config_name="${role}Deployment_Step${step}"
if [ -e "/etc/puppet/hieradata/heat_config_${FACTER_deploy_config_name}.json" ]; then
set +e
- puppet apply --detailed-exitcodes "${manifest}"
+ puppet apply --detailed-exitcodes \
+ --modulepath \
+ /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules \
+ "${manifest}"
echo "puppet apply exited with exit code $rc"