commit 1df17c94f512f0d1a084ba70cc0d4feb05feb8fb
author YAMAMOTO Takashi <yamamoto@midokura.com> Mon May 01 17:00:42 2017 +0900
committer YAMAMOTO Takashi <yamamoto@midokura.com> Mon May 08 15:03:05 2017 +0900
tree d57cdfa5c66d4a3b493eb8d43904d6bf7758de8e
parent 0c0232f508245817eb3de11ec17c6027f8d43709

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

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 492a0ee..fd08a12 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -135,7 +135,11 @@
 
     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