commit 37da4592c200a54dc8dcf6a549fb634a1d5814ca
author Doug Wiegley <dougw@a10networks.com> Fri Jan 30 23:30:08 2015 -0700
committer Doug Wiegley <dougw@a10networks.com> Tue Feb 03 10:59:37 2015 -0600
tree 8d24a67b527bde7e53dd2bb0e24f8f2813c34882
parent e256022a1686eb447da1bbd318c44b58f72f3e0e

Copy neutron service conf files into NEUTRON_CONF_DIR

As part of splitting neutron into pieces, one of the steps was splitting
the various bits of configuration into their respective repos. That just
happened, and this change propagates those config files into /etc/neutron
in the same manner that devstack is using for neutron.conf (and which is
done via setup.cfg, like neutron, for regular package installs.)

Required for neutron review: https://review.openstack.org/#/c/151541/

Change-Id: Ic9aec4401925eca9e1678d84662b96d346a911e3

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 0f49476..6edba5b 100755
--- a/lib/neutron
+++ b/lib/neutron
@@ -957,6 +957,9 @@
 }
 
 function _configure_neutron_lbaas {
+    if [ -f $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf ]; then
+        cp $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf $NEUTRON_CONF_DIR
+    fi
     neutron_agent_lbaas_configure_common
     neutron_agent_lbaas_configure_agent
 }
@@ -967,11 +970,17 @@
 }
 
 function _configure_neutron_fwaas {
+    if [ -f $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf ]; then
+        cp $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf $NEUTRON_CONF_DIR
+    fi
     neutron_fwaas_configure_common
     neutron_fwaas_configure_driver
 }
 
 function _configure_neutron_vpn {
+    if [ -f $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf ]; then
+        cp $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf $NEUTRON_CONF_DIR
+    fi
     neutron_vpn_install_agent_packages
     neutron_vpn_configure_common
 }