openstack
/
tripleo-ci
Code Issues Proposed changes

Let the pre-upgrade hook stop services in pike+ 

The undercloud and client can now work together to automate more of
the undercloud upgrade, so we don't need to do this step in pike and
later.

Change-Id: I158084d6ac3c0bf0970f096962a058e4e352de01
Depends-On: Icb3fe2c1285f8f8574aad583d08c557936ffabe5
This commit is contained in:
Ben Nemec 2017-07-14 18:21:11 +00:00 committed by Emilien Macchi
parent f469d094bc
commit 268abf1fd9
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/tripleo.sh
View File

@ -781,14 +781,13 @@ function undercloud_upgrade {
# Setup repositories
repo_setup
# NOTE(emilien):
# If we don't stop OpenStack services before the upgrade, Puppet run will hang forever.
# This thing might be an ugly workaround but we need to to upgrade the undercloud.
# The question is: where to do it? in tripleoclient? or instack-undercloud?
sudo systemctl stop openstack-*
sudo systemctl stop neutron-*
sudo systemctl stop openvswitch
sudo systemctl stop httpd
# In pike and above this is handled by the pre-upgrade hook
if [[ "$STABLE_RELEASE" =~ ^(newton|ocata)$ ]]; then
sudo systemctl stop openstack-*
sudo systemctl stop neutron-*
sudo systemctl stop openvswitch
sudo systemctl stop httpd
fi
# tripleo cli needs to be updated first
sudo yum -y update python-tripleoclient