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)
[Devstack] cleanup upgrade settings6.3.0stable/newton
We enable plugin and services in project-config. Drop those duplications from devstack/upgrade/settings Change-Id: I95d83d6b1f2914cbb0373099e128ab462fc3b492 (cherry picked from commit 210ec9d3456e908d9f327a75718e63f6c369e1ec)
Notes
Notes (review): Code-Review+1: John L. Villalovos <openstack.org@sodarock.com> Code-Review+2: Dmitry Tantsur <divius.inside@gmail.com> Code-Review+1: Yuriy Zveryanskyy <yzveryanskyy@mirantis.com> Code-Review+2: Julia Kreger <juliaashleykreger@gmail.com> Workflow+1: Julia Kreger <juliaashleykreger@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 11 Jul 2017 21:28:07 +0000 Reviewed-on: https://review.openstack.org/481170 Project: openstack/ironic Branch: refs/heads/stable/newton
-rw-r--r--devstack/upgrade/settings22
1 files changed, 0 insertions, 22 deletions
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 54410e1..2c3b959 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -9,25 +9,3 @@
9 9
10register_project_for_upgrade ironic 10register_project_for_upgrade ironic
11register_db_to_save ironic 11register_db_to_save ironic
12
13
14# NOTE(jlvillal): This file is sourced by the 'load_settings' function in
15# grenade/inc/plugin. So usage of local will work.
16local ir_gren_conf
17local ir_gren_stage
18
19for ir_gren_stage in base target; do
20 # TODO(jlvillal): Remove this logic for checking if the ironic devstack
21 # plugin is enabled, once the enabling of the ironic devstack plugin is
22 # being done in project-config.
23 ir_gren_conf=$(localrc_path ${ir_gren_stage})
24 # Only 'enable_plugin ironic' if it isn't in the file already.
25 if ! grep -q '^enable_plugin ironic ' ${ir_gren_conf} ; then
26 echo "Enabling ironic devstack plugin via grenade for ${ir_gren_stage}"
27 devstack_localrc ${ir_gren_stage} enable_plugin ironic https://git.openstack.org/openstack/ironic
28 else
29 echo "ironic devstack plugin already enabled for ${ir_gren_stage}"
30 fi
31
32 devstack_localrc ${ir_gren_stage} enable_service ir-api ir-cond ironic
33done