openstack/devstack
Code Issues Proposed changes

lib/neutron: Don't assume plugin config is provided by neutron repo

Browse Source 
It isn't the case for plugins provided by subprojects.

Change-Id: Ic28a9da9f11355e5e1eae5db9b2d4ee6ed081b55
This commit is contained in:
YAMAMOTO Takashi 2017-05-01 17:00:42 +09:00
parent 0c0232f508
commit 1df17c94f5
1 changed files with 5 additions and 1 deletions

6
lib/neutron

@ -135,7 +135,11 @@ function configure_neutron_new {
mkdir -p $NEUTRON_CORE_PLUGIN_CONF_PATH
cp $NEUTRON_DIR/etc/neutron/plugins/$NEUTRON_CORE_PLUGIN/$NEUTRON_CORE_PLUGIN_CONF_FILENAME.sample $NEUTRON_CORE_PLUGIN_CONF
# NOTE(yamamoto): A decomposed plugin should prepare the config file in
# its devstack plugin.
if [ -f $NEUTRON_DIR/etc/neutron/plugins/$NEUTRON_CORE_PLUGIN/$NEUTRON_CORE_PLUGIN_CONF_FILENAME.sample ]; then
cp $NEUTRON_DIR/etc/neutron/plugins/$NEUTRON_CORE_PLUGIN/$NEUTRON_CORE_PLUGIN_CONF_FILENAME.sample $NEUTRON_CORE_PLUGIN_CONF
fi
iniset $NEUTRON_CONF database connection `database_connection_url neutron`
iniset $NEUTRON_CONF DEFAULT state_path $NEUTRON_STATE_PATH