diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-21 12:14:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-21 12:14:55 +0000 |
| commit | 791c552817c339d5d08404d07dec8f55bc71f373 (patch) | |
| tree | 648d2b2bec9f945dc6b9e74bbe45579947790322 | |
| parent | 8c91f77ca7b80f5d12adb6da921745792dc38a06 (diff) | |
| parent | 225cff330067b65b5a8b990aeca3424c2b6e1119 (diff) | |
Merge "N->O Manual puppet commands have the right modulepath." into stable/ocata
| -rwxr-xr-x | extraconfig/tasks/run_puppet.sh | 5 | ||||
| -rw-r--r-- | puppet/services/nova-api.yaml | 2 |
2 files changed, 5 insertions, 2 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}" rc=$? echo "puppet apply exited with exit code $rc" else diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index 678e09b6..6a597a88 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -218,7 +218,7 @@ outputs: - name: Run puppet apply to set tranport_url in nova.conf tags: step5 when: is_bootstrap_node - command: puppet apply --detailed-exitcodes /root/nova-api_upgrade_manifest.pp + command: puppet apply --modulepath /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules --detailed-exitcodes /root/nova-api_upgrade_manifest.pp register: puppet_apply_nova_api_upgrade failed_when: puppet_apply_nova_api_upgrade.rc not in [0,2] changed_when: puppet_apply_nova_api_upgrade.rc == 2 |