remove additional service checks for upgrading
Even though you've told grenade to UPGRADE a project, we still go and check to see if it's enabled in devstack before we believe you. For components that are fully implemented in the grenade and devstack trees, this is fine. However for plugins this is weird, because stackrc doesn't provide enough information to figure this out. We should not do this second check, just trust your grenade config is correct. This code was probably vestigial to getting the refactor working correctly before the kilo release. Change-Id: I01d00f95d602b9b159b3b64ff46a7cd3e23c3983
This commit is contained in:
parent
a70641034a
commit
9f84a0c516
19
inc/upgrade
19
inc/upgrade
|
@ -42,25 +42,9 @@ function register_db_to_save {
|
|||
done
|
||||
}
|
||||
|
||||
# Upgrade a service listed in $UPGRADE_PROJECTS.
|
||||
function upgrade_service {
|
||||
local local_service=$1
|
||||
# figure out if the service should be upgraded
|
||||
echo "Checking for $local_service is enabled"
|
||||
local enabled=""
|
||||
# TODO(sdague) terrible work around because of missing
|
||||
# devstack functions
|
||||
if [[ $local_service == 'keystone' ]]; then
|
||||
enabled="True"
|
||||
else
|
||||
enabled=$(
|
||||
source $TARGET_DEVSTACK_DIR/stackrc;
|
||||
is_service_enabled $local_service || echo "False")
|
||||
fi
|
||||
if [[ "$enabled" == "False" ]]; then
|
||||
echo_summary "Not upgrading $local_service"
|
||||
return
|
||||
fi
|
||||
|
||||
local plugin_dir=${PLUGIN_DIR[$local_service]}
|
||||
if [[ -n "$plugin_dir" ]]; then
|
||||
echo_summary "Upgrading $local_service..."
|
||||
|
@ -71,7 +55,6 @@ function upgrade_service {
|
|||
fi
|
||||
}
|
||||
|
||||
|
||||
# This function triggers the upgrade process for each project if it exists,
|
||||
# otherwise it shows up a warning message about the lack of this file.
|
||||
function upgrade_project {
|
||||
|
|
Loading…
Reference in New Issue