diff options
| author |   Sofer Athlan-Guyot <sathlang@redhat.com> | 2017-02-14 14:20:23 +0100 |
|---|---|---|
| committer |   Marios Andreou <marios@redhat.com> | 2017-02-17 09:39:26 +0000 |
| commit | 3440d9d8caa26f0360be9d9d6110ff46e6e8ddb6 (patch) | |
| tree | cc0de934a114e58c54fe1a6f158eb9fae0fb4505 /extraconfig/tasks/tripleo_upgrade_node.sh | |
| parent | aef946f8453d81b8bb6b20f5539e5949209af8a9 (diff) | |
Apply puppet in non-controller script in step.
We want to apply a puppet manifest for the non-controller role, but we
need to apply it in stages. By loading the proper hieradata we get the
needed step configuration.
Change-Id: I07bfeee7b7d9a9b8c2c20e5d5c9ed735d0bfc842
Closes-Bug: #1664304
(cherry picked from commit 237cd2004a2c0869d60d0e11e9dccd59e809ff90)
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 |