openstack/openstack-manuals
Code Issues Proposed changes

Merge "Use sample files from the kilo branch"

Browse Source
This commit is contained in:
Jenkins 2015-04-29 07:30:00 +00:00 committed by Gerrit Code Review
commit aed095792f
9 changed files with 4053 additions and 773 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1770
doc/common/samples/ceilometer.conf
View File

File diff suppressed because it is too large Load Diff

2981
doc/common/samples/cinder.conf.sample Normal file
View File

File diff suppressed because it is too large Load Diff

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

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

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

@ -40,7 +40,7 @@
href="../common/tables/swift-object-server-filter-xprofile.xml"/>
<section xml:id="object-server-conf">
<title>Sample object server configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/kilo"/></programlisting>
</section>
</section>
<section xml:id="object-expirer-configuration">
@ -65,7 +65,7 @@
href="../common/tables/swift-object-expirer-pipeline-main.xml"/>
<section xml:id="object-expirer-conf">
<title>Sample object expirer configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-expirer.conf-sample?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-expirer.conf-sample?h=stable/kilo"/></programlisting>
</section>
</section>
<section xml:id="container-server-configuration">
@ -97,7 +97,7 @@
href="../common/tables/swift-container-server-filter-xprofile.xml"/>
<section xml:id="container-server-conf">
<title>Sample container server configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/kilo"/></programlisting>
</section>
</section>
@ -115,7 +115,7 @@
href="../common/tables/swift-container-sync-realms-realm2.xml"/>
<section xml:id="container-sync-realms-conf">
<title>Sample container sync realms configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-sync-realms.conf-sample?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-sync-realms.conf-sample?h=stable/kilo"/></programlisting>
</section>
</section>
<section xml:id="container-reconciler-configuration">
@ -140,8 +140,7 @@
href="../common/tables/swift-container-reconciler-pipeline-main.xml"/>
<section xml:id="container-reconciler-conf">
<title>Sample container sync reconciler configuration file</title>
<!-- TODO(jaegerandi) Change master to stable/juno -->
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=master"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/kilo"/></programlisting>
</section>
</section>
@ -171,7 +170,7 @@
href="../common/tables/swift-account-server-filter-xprofile.xml"/>
<section xml:id="account-server-conf">
<title>Sample account server configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/kilo"/></programlisting>
</section>
</section>
<section xml:id="proxy-server-configuration">
@ -214,7 +213,7 @@
href="../common/tables/swift-proxy-server-filter-xprofile.xml"/>
<section xml:id="proxy-server-conf">
<title>Sample proxy server configuration file</title>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/kilo"/></programlisting>
</section>
</section>
<section xml:id="swift-memcache-configuration">

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

@ -10,14 +10,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="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/api-paste.ini?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/api-paste.ini?h=stable/kilo"/>
</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="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/policy.json?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/policy.json?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_nova-rootwrap.conf">
@ -30,7 +30,7 @@
option in the <option>[workaround]</option> section
of the <filename>nova.conf</filename> configuration file.</para>
<programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/rootwrap.conf?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/rootwrap.conf?h=stable/kilo"/>
</programlisting>
</section>
</section>

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

@ -11,7 +11,7 @@
<title>keystone.conf</title>
<para>Use the <filename>keystone.conf</filename> file to
configure most Identity service options:</para>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample?h=stable/juno"/>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_keystone-paste.ini">
@ -19,7 +19,7 @@
<para>Use the <filename>keystone-paste.ini</filename> file to
configure the Web Service Gateway Interface (WSGI)
middleware pipeline for the Identity service.</para>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini?h=stable/juno"/>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_keystone-logging.conf">
@ -31,7 +31,7 @@
<para>For details, see the (<link
xlink:href="http://docs.python.org/2/howto/logging.html#configuring-logging"
>Python logging module documentation</link>).</para>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample?h=stable/juno"/>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_keystone-policy.json">
@ -39,7 +39,7 @@
<para>Use the <filename>policy.json</filename> file to define
additional access controls that apply to the Identity
service.</para>
<programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/policy.json?h=stable/juno"/></programlisting>
<programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/policy.json?h=stable/kilo"/></programlisting>
</section>
<section xml:id="section_keystone-domain-configs">
<title>Domain-specific configuration</title>

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

@ -12,7 +12,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="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api.conf?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api.conf?h=stable/kilo"/></programlisting>
</section>
<section xml:id="section_glance-registry.conf">
<title>glance-registry.conf</title>
@ -20,14 +20,14 @@
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="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry.conf?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry.conf?h=stable/kilo"/></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="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api-paste.ini?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api-paste.ini?h=stable/kilo"/></programlisting>
</section>
<section xml:id="section_glance-manage.conf">
<title>glance-manage.conf</title>
@ -44,7 +44,7 @@
<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="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry-paste.ini?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry-paste.ini?h=stable/kilo"/></programlisting>
</section>
<section xml:id="section_glance-scrubber.conf">
<title>glance-scrubber.conf</title>
@ -58,12 +58,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="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/kilo"/></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="https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=stable/juno"/></programlisting>
<programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=stable/kilo"/></programlisting>
</section>
</section>

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

@ -10,14 +10,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="https://git.openstack.org/cgit/openstack/neutron/plain/etc/neutron.conf?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/neutron.conf?h=stable/kilo"/>
</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="https://git.openstack.org/cgit/openstack/neutron/plain/etc/api-paste.ini?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/api-paste.ini?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_neutron-policy.json">
@ -25,7 +25,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="https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_neutron-rootwrap.conf">
@ -34,7 +34,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="https://git.openstack.org/cgit/openstack/neutron/plain/etc/rootwrap.conf?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/rootwrap.conf?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_plugin-agent-conf">
@ -45,25 +45,19 @@
<section xml:id="section_neutron-dhcp_agent.ini">
<title>dhcp_agent.ini</title>
<programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/dhcp_agent.ini?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/dhcp_agent.ini?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_neutron-l3_agent.ini.conf">
<title>l3_agent.ini</title>
<programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/l3_agent.ini?h=stable/juno"/>
</programlisting>
</section>
<section xml:id="section_neutron-lbaas_agent.ini">
<title>lbaas_agent.ini</title>
<programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/lbaas_agent.ini?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/l3_agent.ini?h=stable/kilo"/>
</programlisting>
</section>
<section xml:id="section_neutron-metadata_agent.ini">
<title>metadata_agent.ini</title>
<programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/metadata_agent.ini?h=stable/juno"/>
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/metadata_agent.ini?h=stable/kilo"/>
</programlisting>
</section>
</section>

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

@ -24,7 +24,7 @@
<para>This file provides a standard set of events and corresponding traits
that may be of interest. This file can be modified to add and drop traits
that operators may find useful.</para>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/event_definitions.yaml?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/event_definitions.yaml?h=stable/kilo"/></programlisting>
</section>
<section xml:id="section_pipeline.yaml">
<title>pipeline.yaml</title>
@ -34,7 +34,7 @@
file.</para>
<para>This file can be modified to adjust polling intervals and the
samples generated by the Telemetry module</para>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml?h=stable/juno"/></programlisting>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml?h=stable/kilo"/></programlisting>
</section>
<section xml:id="section_event_pipeline.yaml">
<title>event_pipeline.yaml</title>
@ -49,7 +49,7 @@
<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="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/policy.json?h=stable/juno"/></programlisting>
<programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/policy.json?h=stable/kilo"/></programlisting>
</section>
<!-- TODO(gpocentek): include sources.json -->
</section>