From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 13 Jun 2014 20:56:10 +0000 (+0000)
Subject: Merge "Added note to neutron.conf"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1283c353e4e4caecaca79db0c3e8dfe4041eff24;p=openstack-build%2Fneutron-build.git

Merge "Added note to neutron.conf"
---

1283c353e4e4caecaca79db0c3e8dfe4041eff24
diff --cc etc/neutron.conf
index 2455f2fd7,1c9ba02cd..31977a874
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@@ -413,11 -412,11 +413,15 @@@ 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.
  
 +# Database engine for which script will be generated when using offline
 +# migration
 +# engine =
 +
  # The SQLAlchemy connection string used to connect to the slave database
  # slave_connection =