summaryrefslogtreecommitdiff
path: root/devstack/settings
diff options
context:
space:
mode:
authorVladyslav Drok <vdrok@mirantis.com>2017-06-30 18:28:15 +0300
committerVladyslav Drok <vdrok@mirantis.com>2017-08-17 15:54:10 +0000
commitc4b39e7b09cb52e0c5249e15f7b3aac74e10472d (patch)
tree18be434833cc2430720b7a03be026bde506f6159 /devstack/settings
parentc08c21e30840b20cb979c9f117f15414f45da856 (diff)
downloadironic-c4b39e7b09cb52e0c5249e15f7b3aac74e10472d.tar.gz
Get rid of sourcing stackrc in grenade settings
Instead, use the common_settings file to source all the variables we need at the early stages of devstack setup and during the upgrade itself. This also fixes an issue with the networking-generic-switch upgrade script, which is run from the old release instead of the new one. It depends on a patch from an older release, as grenade is setup using settings from an older release, we need common_setting to be populated there. Change-Id: I0d6d3e9e60785bb9b6a10c8c7a07867a5b2a5e6e Depends-On: I34fb68c150b753824bd2687a1f522ac87771a5e3
Diffstat (limited to 'devstack/settings')
-rw-r--r--devstack/settings2
1 files changed, 2 insertions, 0 deletions
diff --git a/devstack/settings b/devstack/settings
index 4391b56e9..857535a47 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,5 +1,7 @@
enable_service ironic ir-api ir-cond
+source $DEST/ironic/devstack/common_settings
+
# NOTE(vsaienko) mtu calculation has been changed recently to 1450
# https://github.com/openstack/neutron/commit/51a697
# and caused https://bugs.launchpad.net/ironic/+bug/1631875