diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-17 17:49:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-17 17:49:10 +0000 |
| commit | 4e507bf88d9c588c2ce6a3b9d487a10eae2f155f (patch) | |
| tree | a35801e73d214fa35eaa8a1943ec89f3314879e0 /extraconfig | |
| parent | 824c54d313145ffd79b70047bdb3b51c11d1e26a (diff) | |
| parent | e160cd2b53270fb3ec2099b2a5731de38e042f47 (diff) | |
Merge "Add explicit swift check to tripleo_upgrade_node.sh" into stable/ocata
Diffstat (limited to 'extraconfig')
| -rw-r--r-- | extraconfig/tasks/tripleo_upgrade_node.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/extraconfig/tasks/tripleo_upgrade_node.sh b/extraconfig/tasks/tripleo_upgrade_node.sh index 27ba33a8..14dc4885 100644 --- a/extraconfig/tasks/tripleo_upgrade_node.sh +++ b/extraconfig/tasks/tripleo_upgrade_node.sh @@ -15,9 +15,13 @@ cat > $UPGRADE_SCRIPT << ENDOFCAT set -eu NOVA_COMPUTE="" -if systemctl show 'openstack-nova-compute' --property ActiveState | grep '\bactive\b'; then +if hiera -c /etc/puppet/hiera.yaml service_names | grep nova_compute ; then NOVA_COMPUTE="true" fi +SWIFT_STORAGE="" +if hiera -c /etc/puppet/hiera.yaml service_names | grep swift_storage ; then + SWIFT_STORAGE="true" +fi DEBUG="true" SCRIPT_NAME=$(basename $0) @@ -34,10 +38,13 @@ $(declare -f special_case_ovs_upgrade_if_needed) special_case_ovs_upgrade_if_needed yum -y install python-zaqarclient # needed for os-collect-config -systemctl_swift stop +if [[ -n \$SWIFT_STORAGE ]]; then + systemctl_swift stop +fi yum -y update -systemctl_swift start - +if [[ -n \$SWIFT_STORAGE ]]; then + systemctl_swift start +fi # Due to bug#1640177 we need to restart compute agent if [[ -n \$NOVA_COMPUTE ]]; then echo "Restarting openstack ceilometer agent compute" |