Browse code

Provide hook for neutron plugin config

This removes a restriction for neutron vendor plugin.
Some neutron vendor plugins were already decomposed and
there is no config file in Neutron tree. They should prepare
the file in each plugin.

Change-Id: I4997b8eae1f433b1c23f20c06ba254568ac4982b

Hirofumi Ichihara authored on 2015/09/08 13:51:01
Showing 1 changed files
... ...
@@ -901,7 +901,11 @@ function _configure_neutron_common {
901 901
     # If needed, move config file from ``$NEUTRON_DIR/etc/neutron`` to ``NEUTRON_CONF_DIR``
902 902
     mkdir -p /$Q_PLUGIN_CONF_PATH
903 903
     Q_PLUGIN_CONF_FILE=$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
904
-    cp $NEUTRON_DIR/$Q_PLUGIN_CONF_FILE /$Q_PLUGIN_CONF_FILE
904
+    # NOTE(hichihara): Some neutron vendor plugins were already decomposed and
905
+    # there is no config file in Neutron tree. They should prepare the file in each plugin.
906
+    if [ -f $NEUTRON_DIR/$Q_PLUGIN_CONF_FILE ]; then
907
+        cp $NEUTRON_DIR/$Q_PLUGIN_CONF_FILE /$Q_PLUGIN_CONF_FILE
908
+    fi
905 909
 
906 910
     iniset $NEUTRON_CONF database connection `database_connection_url $Q_DB_NAME`
907 911
     iniset $NEUTRON_CONF DEFAULT state_path $DATA_DIR/neutron