commit 30d5fae31548ed998e4c053ba957f95e068eaebc
author Martin Hickey <martin.hickey@ie.ibm.com> Tue Nov 10 13:44:15 2015 +0000
committer Martin Hickey <martin.hickey@ie.ibm.com> Mon Nov 30 16:44:18 2015 +0000
tree 46b0b020bd50792449442bf0dbc3aef2ea2af432
parent bf81732b129675d667d2285859f32db16ef5e2f5

Neutron: Use generated configuration files if available

Generate the neutron core 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: Ic37a16b6cf8eb92030649f1fc8b198738a8cc104
Related-blueprint: autogen-neutron-conf-file
Partial-bug: #1199963
Depends-On: I1c6dc4e7d479f1b7c755597caded24a0f018c712
Co-Authored-By: Louis Taylor <louis@kragniz.eu>

lib/neutron_plugins/services/metering

diff --git a/lib/neutron_plugins/services/metering b/lib/neutron_plugins/services/metering
index 5fd2fdc..5b32468 100644
--- a/lib/neutron_plugins/services/metering
+++ b/lib/neutron_plugins/services/metering
@@ -21,7 +21,7 @@
 
     METERING_AGENT_CONF_FILENAME="$METERING_AGENT_CONF_PATH/metering_agent.ini"
 
-    cp $NEUTRON_DIR/etc/metering_agent.ini $METERING_AGENT_CONF_FILENAME
+    cp $NEUTRON_DIR/etc/metering_agent.ini.sample $METERING_AGENT_CONF_FILENAME
 }
 
 function neutron_metering_stop {