summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasyl Saienko <vsaienko@mirantis.com>2017-03-28 22:23:24 +0300
committerRamamani Yeleswarapu <ramamani.yeleswarapu@intel.com>2017-07-07 14:11:41 -0700
commit58a41817fde4088cbf4a51991ed71663f86348fb (patch)
tree14df77c33b26856db253260195be481f16d8f768
parenta4bfdb67465de0814c9a4b151b84086a70af8207 (diff)
downloadironic-6.3.0.tar.gz
[Devstack] cleanup upgrade settingsnewton-eol6.3.0
We enable plugin and services in project-config. Drop those duplications from devstack/upgrade/settings Change-Id: I95d83d6b1f2914cbb0373099e128ab462fc3b492 (cherry picked from commit 210ec9d3456e908d9f327a75718e63f6c369e1ec)
-rw-r--r--devstack/upgrade/settings22
1 files changed, 0 insertions, 22 deletions
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 54410e13d..2c3b9596e 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -9,25 +9,3 @@
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