commit 10bff0e9968d7a9c59ea7f09f49775973f8b5008
author Martin Hickey <martin.hickey@ie.ibm.com> Thu Dec 03 15:18:10 2015 +0000
committer Martin Hickey <martin.hickey@ie.ibm.com> Thu Dec 10 16:55:07 2015 +0000
tree 0ed49e979f5fca545c32c297cbf6616fb5844225
parent 1f7631dce6252f32c182176b5e11b1f8eaa8b399

Neutron LBaaS: Use generated configuration files if available

Generate the Neutron LBaaS sample config files by using the oslo
generator. The files are generated with a .sample extension and
replace the static example configuration files.

Once the generation code is delivered, the static config files
will be removed.

Change-Id: Iae1e581ec2bea9c0ced700229effcc716d53fe4e
Related-blueprint: autogen-neutron-conf-file
Partial-bug: #1199963
Depends-On: I25507f3bc6e995580aa91a912c2cf4110757df15

lib/neutron_plugins/services/loadbalancer

diff --git a/lib/neutron_plugins/services/loadbalancer b/lib/neutron_plugins/services/loadbalancer
index b07d06c..30e9480 100644
--- a/lib/neutron_plugins/services/loadbalancer
+++ b/lib/neutron_plugins/services/loadbalancer
@@ -28,7 +28,7 @@
 
     LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini"
 
-    cp $NEUTRON_LBAAS_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME
+    cp $NEUTRON_LBAAS_DIR/etc/lbaas_agent.ini.sample $LBAAS_AGENT_CONF_FILENAME
 
     # ovs_use_veth needs to be set before the plugin configuration
     # occurs to allow plugins to override the setting.