diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-17 09:29:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-17 09:29:01 +0000 |
| commit | fcda1872cf51df0325680edb6e7f2c9dcfaa3c2c (patch) | |
| tree | 33a15febba01b71d097b81a6217a49c09fbed309 /extraconfig/tasks/tripleo_upgrade_node.sh | |
| parent | 4fd12f1d18eaee79a299102df370281acf4dfac3 (diff) | |
| parent | 237cd2004a2c0869d60d0e11e9dccd59e809ff90 (diff) | |
Merge "Apply puppet in non-controller script in step."
Diffstat (limited to 'extraconfig/tasks/tripleo_upgrade_node.sh')
| -rw-r--r-- | extraconfig/tasks/tripleo_upgrade_node.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/extraconfig/tasks/tripleo_upgrade_node.sh b/extraconfig/tasks/tripleo_upgrade_node.sh index 27ba33a8..16584254 100644 --- a/extraconfig/tasks/tripleo_upgrade_node.sh +++ b/extraconfig/tasks/tripleo_upgrade_node.sh @@ -44,9 +44,14 @@ if [[ -n \$NOVA_COMPUTE ]]; then systemctl restart openstack-ceilometer-compute fi -# Apply puppet manifest to converge just right after the \$ROLE upgrade -puppet apply /root/${ROLE}_puppet_config.pp - +# Apply puppet manifest to converge just right after the ${ROLE} upgrade +$(declare -f run_puppet) +for step in 1 2 3 4 5 6; do + if ! run_puppet /root/${ROLE}_puppet_config.pp ${ROLE} \${step}; then + echo "Puppet failure at step \${step}" + exit 1 + fi +done ENDOFCAT # ensure the permissions are OK |