From 98d655d82e6bfba50b5e9a3258466eed83a710e2 Mon Sep 17 00:00:00 2001
From: Summer Long <slong@redhat.com>
Date: Tue, 18 Feb 2014 10:38:56 +1000
Subject: [PATCH] Added sample files for Block Storage.

Added cinder.conf (complete), cinder-api-paste.ini,
cinder-policy.json, and cinder-rootwrap.conf file references
(cinder project). Placed under new section.

Partial-Bug: #1281348

Change-Id: I356797441c6307ad1a5ee3dbae1bf24ad95b1ddb
---
 ...ock-storage-sample-configuration-files.xml | 33 +++++++++++++++++++
 .../ch_blockstorageconfigure.xml              |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 doc/config-reference/block-storage/section_block-storage-sample-configuration-files.xml

diff --git a/doc/config-reference/block-storage/section_block-storage-sample-configuration-files.xml b/doc/config-reference/block-storage/section_block-storage-sample-configuration-files.xml
new file mode 100644
index 0000000000..53c321adc5
--- /dev/null
+++ b/doc/config-reference/block-storage/section_block-storage-sample-configuration-files.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+    xml:id="section_block-storage-sample-configuration-files">
+    <title>Block Storage sample configuration files</title>
+    <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>
+            <programlisting language="ini">
+                <xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/cinder.conf.sample"/>
+            </programlisting>
+    </section>
+    <section xml:id="section_cinder-api-paste.ini">
+        <title>api-paste.ini</title>
+        <para>Use the <filename>api-paste.ini</filename> file to configure the Block Storage API service.</para>
+        <programlisting language="ini">
+            <xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/api-paste.ini"/>
+        </programlisting>
+    </section>
+    <section xml:id="section_cinder-policy.json">
+        <title>policy.json</title>
+        <para>The <filename>policy.json</filename> file defines additional access controls that apply to the Block Storage service.</para>
+        <programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/policy.json"/></programlisting>
+    </section>
+    <section xml:id="section_cinder-rootwrap.conf">
+        <title>rootwrap.conf</title>
+        <para>The <filename>rootwrap.conf</filename> file defines configuration values used by the
+                <command>rootwrap</command> script when the Block Storage service must escalate its
+            privileges to those of the root user.</para>
+        <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/rootwrap.conf"/></programlisting>
+    </section>
+</section>
diff --git a/doc/config-reference/ch_blockstorageconfigure.xml b/doc/config-reference/ch_blockstorageconfigure.xml
index 39f67a85cf..0d9fb32d78 100644
--- a/doc/config-reference/ch_blockstorageconfigure.xml
+++ b/doc/config-reference/ch_blockstorageconfigure.xml
@@ -23,4 +23,5 @@
   </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" />
 </chapter>