commit 6262152064eb84dd2ba1bd52b6db08a0dc0870bb
author Jenkins <jenkins@review.openstack.org> Wed Feb 04 03:42:50 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Feb 04 03:42:50 2015 +0000
tree 8ae6e1a57f376c2f690ce3ae442f524c379f986e
parent 8942585c960055cb44e10f7f429e8fd9d5f66d9a
parent 37da4592c200a54dc8dcf6a549fb634a1d5814ca

Merge "Copy neutron service conf files into NEUTRON_CONF_DIR"

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
 }