diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-17 21:53:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-17 21:53:27 +0000 |
| commit | 2da48b89b0fb7157ec567bd4fe677b47ca0cca49 (patch) | |
| tree | 7f999395a22edd1d30e15a687db2bdcc9d79bd75 /extraconfig/tasks/tripleo_upgrade_node.sh | |
| parent | efd866a58bab768a37d01de4d85e5e4870410cee (diff) | |
| parent | 3440d9d8caa26f0360be9d9d6110ff46e6e8ddb6 (diff) | |
Merge "Apply puppet in non-controller script in step." into stable/ocata
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 14dc4885..c2565410 100644 --- a/extraconfig/tasks/tripleo_upgrade_node.sh +++ b/extraconfig/tasks/tripleo_upgrade_node.sh @@ -51,9 +51,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 |