aboutsummaryrefslogtreecommitdiffstats
path: root/extraconfig
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-12 13:00:23 +0000
committerGerrit Code Review <review@openstack.org>2017-02-12 13:00:23 +0000
commitb7c71387bf3a2b5dbe4e7b172b80e92d324e4884 (patch)
treed3ead9b0021a39ca9939f8c391d5c0516372dbf3 /extraconfig
parentc83933e69eea44eac94f094e6161de77d44dec6a (diff)
parentf55d6707619edfdb7bda494f4b2851f2ee747b17 (diff)
Merge "Dump and run puppet for role which are disable_upgrade_deployment true"
Diffstat (limited to 'extraconfig')
-rw-r--r--extraconfig/tasks/tripleo_upgrade_node.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/extraconfig/tasks/tripleo_upgrade_node.sh b/extraconfig/tasks/tripleo_upgrade_node.sh
index 7f056021..27ba33a8 100644
--- a/extraconfig/tasks/tripleo_upgrade_node.sh
+++ b/extraconfig/tasks/tripleo_upgrade_node.sh
@@ -44,6 +44,9 @@ 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
+
ENDOFCAT
# ensure the permissions are OK