openstack/openstack-manuals
Code Issues Proposed changes

Revert "Amended config instructions for cinder.config"

Browse Source 
This reverts commit adfc7259f4
(not reverted: change of wording choosing -> choice)

The original text is correct for Icehouse. For Havana, connection in section DEFAULT is a deprecated setup.

Fix for cinder.conf file for Icehouse:
https://review.openstack.org/#/c/61736/

Change-Id: I001797be9b9421d6818ed902d494bd133bf41b79
This commit is contained in:
Andreas Jaeger
2014-01-10 12:07:33 +00:00
committed by Andreas Jaeger
parent 12783cf76f
commit 1d8e08a69c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/install-guide/section_cinder-controller.xml
View File

@@ -42,12 +42,12 @@
database connection mysql://cinder:<replaceable>CINDER_DBPASS</replaceable>@<replaceable>controller</replaceable>/cinder</userinput></screen>
<para os="ubuntu">Edit
<filename>/etc/cinder/cinder.conf</filename> and change the
<literal>[DEFAULT]</literal> section.</para>
<literal>[database]</literal> section.</para>
<programlisting os="ubuntu" language="ini">[database]
...
# The SQLAlchemy connection string used to connect to the
# database (string value)
sql_connection = mysql://cinder:CINDER_DBPASS@localhost/cinder
connection = mysql://cinder:CINDER_DBPASS@localhost/cinder
...</programlisting>
</step>
<step os="rhel;centos;fedora;opensuse;sles">