From 74e27b9bf3c86642779a199f4de1f1b6ccea04d0 Mon Sep 17 00:00:00 2001 From: Ramamani Yeleswarapu Date: Fri, 30 Jun 2017 10:22:44 -0700 Subject: [PATCH] [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 --- devstack/upgrade/settings | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 50d4f8209..eb149fa33 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -2,26 +2,3 @@ # Based on Ironic/devstack/grenade/settings register_project_for_upgrade 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