From: Jorge Miramontes <jorge.miramontes@rackspace.com>
Date: Wed, 7 May 2014 22:54:50 +0000 (-0500)
Subject: Added note to neutron.conf
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b943ebd4afee831e2da8336046878464830d7b0a;p=openstack-build%2Fneutron-build.git

Added note to neutron.conf

Added note to neutron.conf which clarifies where database
connection attribute should be set.

Change-Id: Ic0631cff789046528cae8622d935b65ae9b012cb
Closes-Bug: #1261298
---

diff --git a/etc/neutron.conf b/etc/neutron.conf
index 984e93c0e..1c9ba02cd 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -412,6 +412,10 @@ admin_password = %SERVICE_PASSWORD%
 # Replace 127.0.0.1 above with the IP address of the database used by the
 # main neutron server. (Leave it as is if the database runs on this host.)
 # connection = sqlite://
+# NOTE: In deployment the [database] section and its connection attribute may
+# be set in the corresponding core plugin '.ini' file. However, it is suggested
+# to put the [database] section and its connection attribute in this
+# configuration file.
 
 # The SQLAlchemy connection string used to connect to the slave database
 # slave_connection =