[Devstack] cleanup upgrade settings

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

Reference commit: 0204bd9ef4a09c791983bc1334fd32d09615ab63

Change-Id: Ie24f97eb3dfc8355845e864aebbd5184e900da30
Closes-Bug: #1672448
This commit is contained in:
Ramamani Yeleswarapu 2017-06-30 10:22:44 -07:00
parent e02bc755a6
commit 74e27b9bf3

View File

@ -2,26 +2,3 @@
# Based on Ironic/devstack/grenade/settings # Based on Ironic/devstack/grenade/settings
register_project_for_upgrade ironic-inspector register_project_for_upgrade ironic-inspector
register_db_to_save ironic_inspector register_db_to_save ironic_inspector
# Inspector plugin and service registration
# NOTE(rama_y): Change similar to what was done in ironic for multi-node grenade testing.
# This file is sourced by the 'load_settings' function in
# grenade/inc/plugin. So usage of local will work.
local insp_gren_conf
local insp_gren_stage
for insp_gren_stage in base target; do
# TODO(rama_y): Remove this logic for checking if the ironic-inspector devstack
# plugin is enabled, once the enabling of the ironic-inspector devstack plugin is
# being done in project-config.
insp_gren_conf=$(localrc_path ${insp_gren_stage})
# Only 'enable_plugin ironic-inspector' if it isn't in the file already.
if ! grep -q '^enable_plugin ironic-inspector ' ${insp_gren_conf} ; then
echo "Enabling ironic-inspector devstack plugin via grenade for ${insp_gren_stage}"
devstack_localrc ${insp_gren_stage} enable_plugin ironic-inspector https://github.com/openstack/ironic-inspector
else
echo "ironic-inspector devstack plugin already enabled for ${insp_gren_stage}"
fi
devstack_localrc ${insp_gren_stage} enable_service ironic-inspector ironic-inspector-dhcp
done