Browse code
lib/neutron: Don't assume plugin config is provided by neutron repo
It isn't the case for plugins provided by subprojects.
Change-Id: Ic28a9da9f11355e5e1eae5db9b2d4ee6ed081b55
YAMAMOTO Takashi authored on 2017/05/01 17:00:42Showing 1 changed files
| ... | ... |
@@ -135,7 +135,11 @@ function configure_neutron_new {
|
| 135 | 135 |
|
| 136 | 136 |
mkdir -p $NEUTRON_CORE_PLUGIN_CONF_PATH |
| 137 | 137 |
|
| 138 |
- cp $NEUTRON_DIR/etc/neutron/plugins/$NEUTRON_CORE_PLUGIN/$NEUTRON_CORE_PLUGIN_CONF_FILENAME.sample $NEUTRON_CORE_PLUGIN_CONF |
|
| 138 |
+ # NOTE(yamamoto): A decomposed plugin should prepare the config file in |
|
| 139 |
+ # its devstack plugin. |
|
| 140 |
+ if [ -f $NEUTRON_DIR/etc/neutron/plugins/$NEUTRON_CORE_PLUGIN/$NEUTRON_CORE_PLUGIN_CONF_FILENAME.sample ]; then |
|
| 141 |
+ cp $NEUTRON_DIR/etc/neutron/plugins/$NEUTRON_CORE_PLUGIN/$NEUTRON_CORE_PLUGIN_CONF_FILENAME.sample $NEUTRON_CORE_PLUGIN_CONF |
|
| 142 |
+ fi |
|
| 139 | 143 |
|
| 140 | 144 |
iniset $NEUTRON_CONF database connection `database_connection_url neutron` |
| 141 | 145 |
iniset $NEUTRON_CONF DEFAULT state_path $NEUTRON_STATE_PATH |