openstack/openstack-manuals
Code Issues Proposed changes

cinder configuration file in Configuration reference guide

Browse Source 
1. Removed the 'cinder.conf configuration file' section
2. Inserted content in the 'cinder.conf' section

Change-Id: I513e844a10eb4a172e15de8b32419b47f82939c5
backport: icehouse
Closes-Bug: 1378405
This commit is contained in:
darrenchan 2014-11-20 15:03:14 +11:00
parent f2468b21b8
commit ab31398f16
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/config-reference/block-storage/section_block-storage-sample-configuration-files.xml
View File

@ -7,8 +7,12 @@
<para>All the files in this section can be found in <systemitem>/etc/cinder</systemitem>.</para>
<section xml:id="section_cinder.conf">
<title>cinder.conf</title>
<para>Use the <filename>cinder.conf</filename> file to configure the
majority of the Block Storage service options.</para>
<para>The <filename>cinder.conf</filename> file is installed in
<filename>/etc/cinder</filename> by default. When you manually
install the Block Storage service, the options in the
<filename>cinder.conf</filename> file are set to default values.</para>
<para>The <filename>cinder.conf</filename> file contains most
of the options to configure the Block Storage service.</para>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/cinder.conf.sample?h=stable/juno"/>
</programlisting>

10
doc/config-reference/ch_blockstorageconfigure.xml
View File

@ -8,16 +8,6 @@
<para>The OpenStack Block Storage service works with many different
storage drivers that you can configure by using these instructions.</para>
<xi:include href="block-storage/section_block-storage-overview.xml"/>
<section xml:id="setting-flags-in-cinder-conf-file">
<title><filename>cinder.conf</filename> configuration file</title>
<para>The <filename>cinder.conf</filename> file is installed in
<filename>/etc/cinder</filename> by default. When you manually
install the Block Storage service, the options in the
<filename>cinder.conf</filename> file are set to default values.</para>
<para>This example shows a typical
<filename>cinder.conf</filename> file:</para>
<programlisting language="ini"><xi:include parse="text" href="../common/samples/cinder.conf"/></programlisting>
</section>
<xi:include href="block-storage/section_volume-drivers.xml"/>
<xi:include href="block-storage/section_backup-drivers.xml"/>
<xi:include href="block-storage/section_block-storage-sample-configuration-files.xml" />