diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-17 11:16:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-17 11:16:37 +0000 |
| commit | 2d36054315f95c0379b0fd50df4dad22da73b126 (patch) | |
| tree | bed524b77d82edef1407d226db48d42b1e073a0b | |
| parent | d8c46fa260f8fdc0127136b7346d5548f9ffb607 (diff) | |
| parent | d8e75b220efec3b17a76bed6898327784fb4e6cc (diff) | |
Merge "Add explicit swift check to tripleo_upgrade_node.sh"
| -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 16584254..c2565410 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" |