openstack/openstack-manuals
Code Issues Proposed changes

Get the sample config files from stable/icehouse

Browse Source 
Since the configuration reference is versioned, get the sample files
from the git stable/icehouse branch. This should avoid grabbing trunk
config files when building backports.

Closes-Bug: #1308452
Change-Id: Id7e38ec69345b8a47d48ce6308440a2ec47d8914
This commit is contained in:
Gauvain Pocentek 2014-04-24 18:40:47 +02:00
parent 4a626c3d9b
commit 241be45fbd
7 changed files with 32 additions and 32 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

@ -8,26 +8,26 @@
<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"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/cinder.conf.sample?h=stable/icehouse"/>
</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"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/api-paste.ini?h=stable/icehouse"/>
</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>
<programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/policy.json?h=stable/icehouse"/></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>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/cinder/plain/etc/cinder/rootwrap.conf?h=stable/icehouse"/></programlisting>
</section>
</section>

8
doc/config-reference/ch_objectstorageconfigure.xml
View File

@ -37,7 +37,7 @@
href="../common/tables/swift-object-server-filter-recon.xml"/>
<section xml:id="object-server-conf">
<title>Sample object server configuration file</title>
<programlisting><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/icehouse"/></programlisting>
</section>
</section>
<section xml:id="container-server-configuration">
@ -66,7 +66,7 @@
href="../common/tables/swift-container-server-filter-recon.xml"/>
<section xml:id="container-server-conf">
<title>Sample container server configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/icehouse"/></programlisting>
</section>
</section>
@ -94,7 +94,7 @@
href="../common/tables/swift-account-server-filter-recon.xml"/>
<section xml:id="account-server-conf">
<title>Sample account server configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/icehouse"/></programlisting>
</section>
</section>
<section xml:id="proxy-server-configuration">
@ -129,7 +129,7 @@
href="../common/tables/swift-proxy-server-filter-tempauth.xml"/>
<section xml:id="proxy-server-conf">
<title>Sample proxy server configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/icehouse"/></programlisting>
</section>
</section>
<!-- section on Object Storage Features -->

6
doc/config-reference/compute/section_compute-sample-configuration-files.xml
View File

@ -8,14 +8,14 @@
<para>The Compute service stores its API configuration settings in the
<filename>api-paste.ini</filename> file.</para>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/nova/plain/etc/nova/api-paste.ini"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/nova/plain/etc/nova/api-paste.ini?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_nova-policy.json">
<title>policy.json</title>
<para>The <filename>policy.json</filename> file defines additional access controls that apply to the Compute service.</para>
<programlisting language="json">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/nova/plain/etc/nova/policy.json"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/nova/plain/etc/nova/policy.json?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_nova-rootwrap.conf">
@ -24,7 +24,7 @@
values used by the rootwrap script when the Compute service
needs to escalate its privileges to those of the root user.</para>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/nova/plain/etc/nova/rootwrap.conf"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/nova/plain/etc/nova/rootwrap.conf?h=stable/icehouse"/>
</programlisting>
</section>
</section>

8
doc/config-reference/identity/section_keystone-sample-conf-files.xml
View File

@ -11,7 +11,7 @@
<para>The majority of the Identity service configuration is performed from the
<filename>keystone.conf</filename> file.</para>
<para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample"/>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample?h=stable/icehouse"/>
</programlisting>
</para>
</section>
@ -22,7 +22,7 @@
the Identity service.
</para>
<para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini"/>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini?h=stable/icehouse"/>
</programlisting>
</para>
</section>
@ -34,7 +34,7 @@
logging module documentation (
<link xlink:href="http://docs.python.org/2/howto/logging.html#configuring-logging">Python Logging</link>).</para>
<para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample"/>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample?h=stable/icehouse"/>
</programlisting>
</para>
</section>
@ -43,7 +43,7 @@
<para>The <filename>policy.json</filename> file defines additional access controls that
apply to the Identity service.</para>
<para>
<programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/policy.json"/>
<programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/policy.json?h=stable/icehouse"/>
</programlisting>
</para>
</section>

12
doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
View File

@ -9,7 +9,7 @@
<para>The configuration file for the Image Service API is found in the
<filename>glance-api.conf</filename> file.</para>
<para>This file must be modified after installation.</para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api.conf"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api.conf?h=stable/icehouse"/></programlisting>
</section>
<section xml:id="section_glance-registry.conf">
<title>glance-registry.conf</title>
@ -17,20 +17,20 @@
stores the metadata about images, is found in the
<filename>glance-registry.conf</filename> file.</para>
<para>This file must be modified after installation.</para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry.conf"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry.conf?h=stable/icehouse"/></programlisting>
</section>
<section xml:id="section_glance-api-paste.conf">
<title>glance-api-paste.ini</title>
<para>Configuration for the Image Service's API middleware pipeline is found in the
<filename>glance-api-paste.ini</filename> file.</para>
<para>You should not need to modify this file.</para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api-paste.ini"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api-paste.ini?h=stable/icehouse"/></programlisting>
</section>
<section xml:id="section_glance-registry-paste.conf">
<title>glance-registry-paste.ini</title>
<para>The Image Service's middleware pipeline for its registry is found in the
<filename>glance-registry-paste.ini</filename> file.</para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry-paste.ini"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry-paste.ini?h=stable/icehouse"/></programlisting>
</section>
<section xml:id="section_glance-scrubber.conf">
<title>glance-scrubber.conf</title>
@ -44,12 +44,12 @@
<systemitem>cleanup_scrubber</systemitem> coordinates other
<systemitem>glance-scrubber</systemitem> instances by maintaining the master queue
of images that need to be removed.</para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/icehouse"/></programlisting>
</section>
<section xml:id="section_glance-policy.json">
<title>policy.json</title>
<para>The <filename>/etc/glance/policy.json</filename> file defines additional access controls
that apply to the Image Service.</para>
<programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json"/></programlisting>
<programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=stable/icehouse"/></programlisting>
</section>
</section>

16
doc/config-reference/networking/section_networking-sample-configuration-files.xml
View File

@ -8,14 +8,14 @@
<para>Use the <filename>neutron.conf</filename> file to configure the
majority of the OpenStack Networking options.</para>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/neutron.conf"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/neutron.conf?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_neutron-api-paste.ini">
<title>api-paste.ini</title>
<para>Use the <filename>api-paste.ini</filename> to configure the OpenStack Networking API.</para>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/api-paste.ini"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/api-paste.ini?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_neutron-policy.json">
@ -23,7 +23,7 @@
<para>Use the <filename>policy.json</filename> file to define additional access controls
that apply to the OpenStack Networking service.</para>
<programlisting language="json">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_neutron-rootwrap.conf">
@ -32,7 +32,7 @@
<command>rootwrap</command> script when the OpenStack Networking 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/neutron/plain/etc/rootwrap.conf"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/rootwrap.conf?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_plugin-agent-conf">
@ -43,25 +43,25 @@
<section xml:id="section_neutron-dhcp_agent.ini">
<title>dhcp_agent.ini</title>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/dhcp_agent.ini"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/dhcp_agent.ini?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_neutron-l3_agent.ini.conf">
<title>l3_agent.ini</title>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/l3_agent.ini"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/l3_agent.ini?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_neutron-lbaas_agent.ini">
<title>lbaas_agent.ini</title>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/lbaas_agent.ini"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/lbaas_agent.ini?h=stable/icehouse"/>
</programlisting>
</section>
<section xml:id="section_neutron-metadata_agent.ini">
<title>metadata_agent.ini</title>
<programlisting language="ini">
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/metadata_agent.ini"/>
<xi:include parse="text" href="http://git.openstack.org/cgit/openstack/neutron/plain/etc/metadata_agent.ini?h=stable/icehouse"/>
</programlisting>
</section>
</section>

6
doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml
View File

@ -20,7 +20,7 @@
events received from other OpenStack components should be translated
to Telemetry samples.</para>
<para>You should not need to modify this file.</para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/event_definitions.yaml"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/event_definitions.yaml?h=stable/icehouse"/></programlisting>
</section>
<section xml:id="section_pipeline.yaml">
<title>pipeline.yaml</title>
@ -29,13 +29,13 @@
data. They are defined in the <filename>pipeline.yaml</filename>
file.</para>
<para>You should not need to modify this file.</para>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml?h=stable/icehouse"/></programlisting>
</section>
<section xml:id="section_ceilometer-policy.json">
<title>policy.json</title>
<para>The <filename>policy.json</filename> file defines additional
access controls that apply to the Telemetry service.</para>
<programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/policy.json"/></programlisting>
<programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/policy.json?h=stable/icehouse"/></programlisting>
</section>
<!-- TODO(gpocentek): include sources.json -->
</section>