diff options
| author |   marios <marios@redhat.com> | 2017-02-15 16:20:36 +0200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-02-17 12:11:58 +0000 |
| commit | e160cd2b53270fb3ec2099b2a5731de38e042f47 (patch) | |
| tree | ae2b254b8018733f6049bd0eb5f11fee29138bd1 | |
| parent | aef946f8453d81b8bb6b20f5539e5949209af8a9 (diff) | |
Add explicit swift check to tripleo_upgrade_node.sh
And change the conditional to use hiera instead.
Change-Id: Icf91dd91c0ab04e7919172fcfd130183bfd427b4
(cherry picked from commit d8e75b220efec3b17a76bed6898327784fb4e6cc)
| -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" |