openstack
/
ironic
Code Issues Proposed changes

[Devstack] cleanup upgrade settings 

We enable plugin and services in project-config.
Drop those duplications from devstack/upgrade/settings

Change-Id: I95d83d6b1f2914cbb0373099e128ab462fc3b492
(cherry picked from commit 210ec9d345)
This commit is contained in:
Vasyl Saienko 2017-03-28 22:23:24 +03:00 committed by Ramamani Yeleswarapu
parent ff4be0cd40
commit d7574ac1fd
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devstack/upgrade/settings
View File

@ -10,28 +10,6 @@
register_project_for_upgrade ironic
register_db_to_save ironic
# NOTE(jlvillal): This file is sourced by the 'load_settings' function in
# grenade/inc/plugin. So usage of local will work.
local ir_gren_conf
local ir_gren_stage
for ir_gren_stage in base target; do
# TODO(jlvillal): Remove this logic for checking if the ironic devstack
# plugin is enabled, once the enabling of the ironic devstack plugin is
# being done in project-config.
ir_gren_conf=$(localrc_path ${ir_gren_stage})
# Only 'enable_plugin ironic' if it isn't in the file already.
if ! grep -q '^enable_plugin ironic ' ${ir_gren_conf} ; then
echo "Enabling ironic devstack plugin via grenade for ${ir_gren_stage}"
devstack_localrc ${ir_gren_stage} enable_plugin ironic https://git.openstack.org/openstack/ironic
else
echo "ironic devstack plugin already enabled for ${ir_gren_stage}"
fi
devstack_localrc ${ir_gren_stage} enable_service ir-api ir-cond ironic
done
# Duplicate some setup bits from target DevStack. Use old devstack as we install base environment from it.
BASE_TOP_DIR=$TOP_DIR/../../old/devstack/
source $BASE_TOP_DIR/stackrc