openstack/openstack-manuals
Code Issues Proposed changes

Merge "Liberty Release note/link updates for all guides"

Browse Source
This commit is contained in:
Jenkins 2015-10-15 05:37:02 +00:00 committed by Gerrit Code Review
commit 11e1a458bd
40 changed files with 96 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/admin-guide-cloud/source/blockstorage_volume_migration.rst
View File

@ -29,7 +29,7 @@ These workflows are possible for a migration:
While most back-ends support this function, not all do. See the driver While most back-ends support this function, not all do. See the driver
documentation in the `OpenStack Configuration Reference documentation in the `OpenStack Configuration Reference
<http://docs.openstack.org/kilo/config-reference/content/>`__ for more <http://docs.openstack.org/liberty/config-reference/content/>`__ for more
details. details.
#. If the volume is attached to a VM instance, the Block Storage creates a #. If the volume is attached to a VM instance, the Block Storage creates a

2
doc/admin-guide-cloud/source/compute-configuring-migrations.rst
View File

@ -272,7 +272,7 @@ Example Compute installation environment
#. You can now configure other options for live migration. In most cases, you #. You can now configure other options for live migration. In most cases, you
will not need to configure any options. For advanced configuration options, will not need to configure any options. For advanced configuration options,
see the `OpenStack Configuration Reference Guide <http://docs.openstack.org/ see the `OpenStack Configuration Reference Guide <http://docs.openstack.org/
kilo/config-reference/content/list-of-compute-config-options.html liberty/config-reference/content/list-of-compute-config-options.html
#config_table_nova_livemigration>`_. #config_table_nova_livemigration>`_.
.. _true-live-migration-kvm-libvirt: .. _true-live-migration-kvm-libvirt:

10
doc/admin-guide-cloud/source/compute-images-instances.rst
View File

@ -29,7 +29,7 @@ flavors that you can edit or add to.
- For more information about image configuration options, see the - For more information about image configuration options, see the
`Image `Image
services <http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-image-service.html>`__ services <http://docs.openstack.org/liberty/config-reference/content/ch_configuring-openstack-image-service.html>`__
section of the OpenStack Configuration Reference. section of the OpenStack Configuration Reference.
- For more information about flavors, see :ref:`compute-flavors` or - For more information about flavors, see :ref:`compute-flavors` or
@ -286,7 +286,7 @@ these steps:
`glance-api` service does not start. `glance-api` service does not start.
To view a sample configuration file, see To view a sample configuration file, see
`glance-api.conf <http://docs.openstack.org/kilo/config-reference/content/section_glance-api.conf.html>`__. `glance-api.conf <http://docs.openstack.org/liberty/config-reference/content/section_glance-api.conf.html>`__.
#. Optionally, in the :file:`glance-api.conf` file, specify whether roles or #. Optionally, in the :file:`glance-api.conf` file, specify whether roles or
policies are used in the property protections configuration file:: policies are used in the property protections configuration file::
@ -296,7 +296,7 @@ these steps:
The default is ``roles``. The default is ``roles``.
To view a sample configuration file, see To view a sample configuration file, see
`glance-api.conf <http://docs.openstack.org/kilo/config-reference/content/section_glance-api.conf.html>`__. `glance-api.conf <http://docs.openstack.org/liberty/config-reference/content/section_glance-api.conf.html>`__.
Image download: how it works Image download: how it works
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -330,7 +330,7 @@ Compute nodes also implement caching of images, meaning that if an image
has been used before it won't necessarily be downloaded every time. has been used before it won't necessarily be downloaded every time.
Information on the configuration options for caching on compute nodes Information on the configuration options for caching on compute nodes
can be found in the `Configuration can be found in the `Configuration
Reference <http://docs.openstack.org/kilo/config-reference/content/>`__. Reference <http://docs.openstack.org/liberty/config-reference/content/>`__.
Instance building blocks Instance building blocks
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
@ -426,7 +426,7 @@ Guide <http://docs.openstack.org/user-guide/index.html>`__.
Control where instances run Control where instances run
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
The `OpenStack Configuration The `OpenStack Configuration
Reference <http://docs.openstack.org/kilo/config-reference/content/>`__ Reference <http://docs.openstack.org/liberty/config-reference/content/>`__
provides detailed information on controlling where your instances run, provides detailed information on controlling where your instances run,
including ensuring a set of instances run on different compute nodes for including ensuring a set of instances run on different compute nodes for
service resiliency or on the same node for high performance service resiliency or on the same node for high performance

2
doc/admin-guide-cloud/source/compute-live-migration-usage.rst
View File

@ -16,7 +16,7 @@ Before starting a migration, review the Configure migrations section.
Although the :command:`nova` command is called :command:`live-migration`, Although the :command:`nova` command is called :command:`live-migration`,
under the default Compute configuration options, the instances under the default Compute configuration options, the instances
are suspended before migration. For more information, see are suspended before migration. For more information, see
`Configure migrations <http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html>`_. `Configure migrations <http://docs.openstack.org/liberty/config-reference/content/list-of-compute-config-options.html>`_.
in the OpenStack Configuration Reference. in the OpenStack Configuration Reference.
**Migrating instances** **Migrating instances**

6
doc/admin-guide-cloud/source/compute-manage-logs.rst
View File

@ -39,7 +39,7 @@ For more about the logging configuration syntax, including the
on logging configuration files. on logging configuration files.
For an example :file:`logging.conf` file with various defined handlers, see For an example :file:`logging.conf` file with various defined handlers, see
the `OpenStack Configuration Reference <http://docs.openstack.org/kilo/config-reference/content/>`__. the `OpenStack Configuration Reference <http://docs.openstack.org/liberty/config-reference/content/>`__.
Syslog Syslog
~~~~~~ ~~~~~~
@ -130,8 +130,8 @@ The serial console provides a way to examine kernel output and other
system messages during troubleshooting if the instance lacks network system messages during troubleshooting if the instance lacks network
connectivity. connectivity.
OpenStack Icehouse and earlier supports read-only access using the Read-only access from server serial console is possible
serial console using the ``os-GetSerialOutput`` server action. Most using the ``os-GetSerialOutput`` server action. Most
cloud images enable this feature by default. For more information, see cloud images enable this feature by default. For more information, see
:ref:`compute-common-errors-and-fixes`. :ref:`compute-common-errors-and-fixes`.

2
doc/admin-guide-cloud/source/compute-networking-nova.rst
View File

@ -195,7 +195,7 @@ configuration file. Specify the configuration file using the
For more information about creating a dnsmasq configuration file, see For more information about creating a dnsmasq configuration file, see
the `OpenStack Configuration the `OpenStack Configuration
Reference <http://docs.openstack.org/kilo/config-reference/content/>`__, Reference <http://docs.openstack.org/liberty/config-reference/content/>`__,
and `the dnsmasq and `the dnsmasq
documentation <http://www.thekelleys.org.uk/dnsmasq/docs/dnsmasq.conf.example>`__. documentation <http://www.thekelleys.org.uk/dnsmasq/docs/dnsmasq.conf.example>`__.

2
doc/admin-guide-cloud/source/compute-service-groups.rst
View File

@ -80,7 +80,7 @@ node for the ZooKeeper driver:
address="192.168.2.1:2181,192.168.2.2:2181,192.168.2.3:2181" address="192.168.2.1:2181,192.168.2.2:2181,192.168.2.3:2181"
For Compute Service groups customization options, see the `OpenStack For Compute Service groups customization options, see the `OpenStack
Configuration Reference Guide <http://docs.openstack.org/kilo/config-reference/ Configuration Reference Guide <http://docs.openstack.org/liberty/config-reference/
content/list-of-compute-config-options.html#config_table_nova_zookeeper>`_. content/list-of-compute-config-options.html#config_table_nova_zookeeper>`_.
.. _memcache-servicegroup-driver: .. _memcache-servicegroup-driver:

6
doc/admin-guide-cloud/source/compute_arch.rst
View File

@ -72,7 +72,7 @@ availability zones. Compute supports the following hypervisors:
- `Xen <http://www.xen.org/support/documentation.html>`__ - `Xen <http://www.xen.org/support/documentation.html>`__
For more information about hypervisors, see the For more information about hypervisors, see the
`Hypervisors <http://docs.openstack.org/kilo/config-reference/content/section_compute-hypervisors.html>`__ `Hypervisors <http://docs.openstack.org/liberty/config-reference/content/section_compute-hypervisors.html>`__
section in the OpenStack Configuration Reference. section in the OpenStack Configuration Reference.
Tenants, users, and roles Tenants, users, and roles
@ -179,7 +179,7 @@ case, the root file system can be on the persistent volume, and its
state is maintained, even if the instance is shut down. For more state is maintained, even if the instance is shut down. For more
information about this type of configuration, see the `OpenStack information about this type of configuration, see the `OpenStack
Configuration Reference Configuration Reference
<http://docs.openstack.org/kilo/config-reference/content/>`__. <http://docs.openstack.org/liberty/config-reference/content/>`__.
.. note:: .. note::
@ -196,7 +196,7 @@ In addition to the native compute API, OpenStack provides an
EC2-compatible API. This API allows EC2 legacy workflows built for EC2 EC2-compatible API. This API allows EC2 legacy workflows built for EC2
to work with OpenStack. For more information and configuration options to work with OpenStack. For more information and configuration options
about this compatibility API, see the `OpenStack Configuration about this compatibility API, see the `OpenStack Configuration
Reference <http://docs.openstack.org/kilo/config-reference/content/>`__. Reference <http://docs.openstack.org/liberty/config-reference/content/>`__.
Numerous third-party tools and language-specific SDKs can be used to Numerous third-party tools and language-specific SDKs can be used to
interact with OpenStack clouds, using both native and compatibility interact with OpenStack clouds, using both native and compatibility

2
doc/admin-guide-cloud/source/cross_project_cors.rst
View File

@ -24,7 +24,7 @@ security advisory below for more information.
not covered by this document. For those, please refer to their respective not covered by this document. For those, please refer to their respective
implementations: implementations:
* `CORS in Object Storage <http://docs.openstack.org/kilo/config-reference/content/object-storage-cores.html>`_ * `CORS in Object Storage <http://docs.openstack.org/liberty/config-reference/content/object-storage-cores.html>`_
* `CORS in dashboard <http://docs.openstack.org/security-guide/dashboard/cross-origin-resource-sharing-cors.html>`_ * `CORS in dashboard <http://docs.openstack.org/security-guide/dashboard/cross-origin-resource-sharing-cors.html>`_

6
doc/admin-guide-cloud/source/networking_config-agents.rst
View File

@ -122,7 +122,7 @@ service, or no longer needed.
This feature applies to all plug-ins that support DHCP scaling. For more This feature applies to all plug-ins that support DHCP scaling. For more
information, see the `DHCP agent configuration information, see the `DHCP agent configuration
options <http://docs.openstack.org/kilo/config-reference/content/networking options <http://docs.openstack.org/liberty/config-reference/content/networking
-options-dhcp.html>`__ -options-dhcp.html>`__
listed in the OpenStack Configuration Reference. listed in the OpenStack Configuration Reference.
@ -420,7 +420,7 @@ Configure Hyper-V L2 agent
Before you install the OpenStack Networking Hyper-V L2 agent on a Before you install the OpenStack Networking Hyper-V L2 agent on a
Hyper-V compute node, ensure the compute node has been configured Hyper-V compute node, ensure the compute node has been configured
correctly using these correctly using these
`instructions <http://docs.openstack.org/kilo/config-reference/content/ `instructions <http://docs.openstack.org/liberty/config-reference/content/
hyper-v-virtualization-platform.html>`__. hyper-v-virtualization-platform.html>`__.
**To install the OpenStack Networking Hyper-V agent and configure the node** **To install the OpenStack Networking Hyper-V agent and configure the node**
@ -447,7 +447,7 @@ hyper-v-virtualization-platform.html>`__.
#. Create the :file:`C:\etc\neutron-hyperv-agent.conf` file and add the proper #. Create the :file:`C:\etc\neutron-hyperv-agent.conf` file and add the proper
configuration options and the `Hyper-V related configuration options and the `Hyper-V related
options <http://docs.openstack.org/kilo/config-reference/content/ options <http://docs.openstack.org/liberty/config-reference/content/
networking-plugin-hyperv_agent.html>`__. Here is a sample config file: networking-plugin-hyperv_agent.html>`__. Here is a sample config file:
.. code-block:: ini .. code-block:: ini

6
doc/admin-guide-cloud/source/networking_introduction.rst
View File

@ -297,12 +297,6 @@ an IP address between two instances to enable fast data plane failover.
$ neutron port-update PORT_UUID --allowed-address-pairs type=dict $ neutron port-update PORT_UUID --allowed-address-pairs type=dict
list=true mac_address=MAC_ADDRESS,ip_address=IP_CIDR list=true mac_address=MAC_ADDRESS,ip_address=IP_CIDR
.. Note::
In releases earlier than Juno, OpenStack Networking prevents setting
an allowed address pair on a port that matches the MAC address and
one of the fixed IP addresses of the port.
.. |FWaaS architecture| image:: ../../common/figures/fwaas.png .. |FWaaS architecture| image:: ../../common/figures/fwaas.png

2
doc/admin-guide-cloud/source/objectstorage-admin.rst
View File

@ -8,5 +8,5 @@ information is maintained in developer documentation at
`docs.openstack.org/developer/swift/ <http://docs.openstack.org/developer/swift/>`__. `docs.openstack.org/developer/swift/ <http://docs.openstack.org/developer/swift/>`__.
See the `OpenStack Configuration See the `OpenStack Configuration
Reference <http://docs.openstack.org/kilo/config-reference/content/>`__ Reference <http://docs.openstack.org/liberty/config-reference/content/>`__
for a list of configuration options for Object Storage. for a list of configuration options for Object Storage.

3
doc/admin-guide-cloud/source/orchestration-auth-model.rst
View File

@ -53,9 +53,6 @@ The following steps are executed for password authorization:
Keystone trusts authorization Keystone trusts authorization
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
OpenStack Identity trusts is a new authorization method available
since the Icehouse release.
A trust is an OpenStack Identity extension that provides a method A trust is an OpenStack Identity extension that provides a method
to enable delegation, and optionally impersonation via OpenStack to enable delegation, and optionally impersonation via OpenStack
Identity. The key terminology is *trustor* (the user delegating) and Identity. The key terminology is *trustor* (the user delegating) and

2
doc/admin-guide-cloud/source/telemetry-alarms.rst
View File

@ -116,7 +116,7 @@ information about this approach, see the section called
To use this workload partitioning solution set the To use this workload partitioning solution set the
``evaluation_service`` option to ``default``. For more ``evaluation_service`` option to ``default``. For more
information, see the alarm section in the information, see the alarm section in the
`OpenStack Configuration Reference <http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-telemetry.html>`_. `OpenStack Configuration Reference <http://docs.openstack.org/liberty/config-reference/content/ch_configuring-openstack-telemetry.html>`_.
Using alarms Using alarms
~~~~~~~~~~~~ ~~~~~~~~~~~~

6
doc/admin-guide-cloud/source/telemetry-data-collection.rst
View File

@ -1013,12 +1013,6 @@ supported to start multiple worker threads per collector process. The
<http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-telemetry.html>`__ <http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-telemetry.html>`__
of the :file:`ceilometer.conf` configuration file. of the :file:`ceilometer.conf` configuration file.
.. note::
Prior to the Juno release, it is not recommended to use multiple
workers per collector process when using PostgreSQL as the database
back end.
Database dispatcher Database dispatcher
------------------- -------------------
When the database dispatcher is configured as data store, you have the When the database dispatcher is configured as data store, you have the

2
doc/admin-guide-cloud/source/ts_no_emulator_x86_64.rst
View File

@ -15,6 +15,6 @@ On the KVM host, run ``cat /proc/cpuinfo``. Make sure the ``vmx`` or
``svm`` flags are set. ``svm`` flags are set.
Follow the instructions in the `enabling KVM Follow the instructions in the `enabling KVM
section <http://docs.openstack.org/kilo/config-reference/content/kvm.html#section_kvm_enable>`__ section <http://docs.openstack.org/liberty/config-reference/content/kvm.html#section_kvm_enable>`__
of the Configuration Reference to enable hardware virtualization support of the Configuration Reference to enable hardware virtualization support
in your BIOS. in your BIOS.

10
doc/common-rst/app_support.rst
View File

@ -26,14 +26,14 @@ associated components:
- `Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise - `Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise
Server 12 Server 12
<http://docs.openstack.org/kilo/install-guide/install/zypper/content/>`__ <http://docs.openstack.org/liberty/install-guide-obs/>`__
- `Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and - `Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and
Fedora Fedora
21 <http://docs.openstack.org/kilo/install-guide/install/yum/content/>`__ 21 <http://docs.openstack.org/liberty/install-guide-rdo/>`__
- `Installation Guide for Ubuntu - `Installation Guide for Ubuntu
14.04 <http://docs.openstack.org/kilo/install-guide/install/apt/content/>`__ 14.04 <http://docs.openstack.org/liberty/install-guide-ubuntu/>`__
The following books explain how to configure and run an OpenStack cloud: The following books explain how to configure and run an OpenStack cloud:
@ -44,7 +44,7 @@ The following books explain how to configure and run an OpenStack cloud:
Guide <http://docs.openstack.org/admin-guide-cloud/>`__ Guide <http://docs.openstack.org/admin-guide-cloud/>`__
- `Configuration - `Configuration
Reference <http://docs.openstack.org/juno/config-reference/content/>`__ Reference <http://docs.openstack.org/liberty/config-reference/content/>`__
- `Operations Guide <http://docs.openstack.org/ops/>`__ - `Operations Guide <http://docs.openstack.org/ops/>`__
@ -140,7 +140,7 @@ Some tips:
- Be sure to include the software and package versions that you are - Be sure to include the software and package versions that you are
using, especially if you are using a development branch, such as, using, especially if you are using a development branch, such as,
``"Juno release" vs git commit bc79c3ecc55929bac585d04a03475b72e06a3208``. ``"Kilo release" vs git commit bc79c3ecc55929bac585d04a03475b72e06a3208``.
- Any deployment-specific information is helpful, such as whether you - Any deployment-specific information is helpful, such as whether you
are using Ubuntu 14.04 or are performing a multi-node installation. are using Ubuntu 14.04 or are performing a multi-node installation.

12
doc/common/app_support.xml
View File

@ -30,7 +30,7 @@
<listitem> <listitem>
<para> <para>
<link <link
xlink:href="http://docs.openstack.org/kilo/install-guide/install/zypper/content/"> xlink:href="http://docs.openstack.org/liberty/install-guide-obs/">
<citetitle>Installation Guide for openSUSE 13.2 and <citetitle>Installation Guide for openSUSE 13.2 and
SUSE Linux Enterprise Server 12</citetitle> SUSE Linux Enterprise Server 12</citetitle>
</link></para> </link></para>
@ -38,16 +38,16 @@
<listitem> <listitem>
<para> <para>
<link <link
xlink:href="http://docs.openstack.org/kilo/install-guide/install/yum/content/"> xlink:href="http://docs.openstack.org/liberty/install-guide-rdo/">
<citetitle>Installation Guide for Red Hat <citetitle>Installation Guide for Red Hat
Enterprise Linux 7, CentOS 7, and Enterprise Linux 7, CentOS 7, and
Fedora 21</citetitle> Fedora 22</citetitle>
</link></para> </link></para>
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
<link <link
xlink:href="http://docs.openstack.org/kilo/install-guide/install/apt/content/"> xlink:href="http://docs.openstack.org/liberty/install-guide-ubuntu/">
<citetitle>Installation Guide for Ubuntu <citetitle>Installation Guide for Ubuntu
14.04 (LTS)</citetitle> 14.04 (LTS)</citetitle>
</link></para> </link></para>
@ -71,7 +71,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para><link <para><link
xlink:href="http://docs.openstack.org/kilo/config-reference/content/" xlink:href="http://docs.openstack.org/liberty/config-reference/content/"
><citetitle>Configuration ><citetitle>Configuration
Reference</citetitle></link></para> Reference</citetitle></link></para>
</listitem> </listitem>
@ -226,7 +226,7 @@
<para>Be sure to include the software and package <para>Be sure to include the software and package
versions that you are using, especially if you are versions that you are using, especially if you are
using a development branch, such as, using a development branch, such as,
<literal>"Juno release" vs git commit <literal>"Liberty release" vs git commit
bc79c3ecc55929bac585d04a03475b72e06a3208</literal>.</para> bc79c3ecc55929bac585d04a03475b72e06a3208</literal>.</para>
</listitem> </listitem>
<listitem> <listitem>

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

@ -40,7 +40,7 @@
href="../common/tables/swift-object-server-filter-xprofile.xml"/> href="../common/tables/swift-object-server-filter-xprofile.xml"/>
<section xml:id="object-server-conf"> <section xml:id="object-server-conf">
<title>Sample object server configuration file</title> <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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/liberty"/></programlisting>
</section> </section>
</section> </section>
<section xml:id="object-expirer-configuration"> <section xml:id="object-expirer-configuration">
@ -65,7 +65,7 @@
href="../common/tables/swift-object-expirer-pipeline-main.xml"/> href="../common/tables/swift-object-expirer-pipeline-main.xml"/>
<section xml:id="object-expirer-conf"> <section xml:id="object-expirer-conf">
<title>Sample object expirer configuration file</title> <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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-expirer.conf-sample?h=stable/liberty"/></programlisting>
</section> </section>
</section> </section>
<section xml:id="container-server-configuration"> <section xml:id="container-server-configuration">
@ -97,7 +97,7 @@
href="../common/tables/swift-container-server-filter-xprofile.xml"/> href="../common/tables/swift-container-server-filter-xprofile.xml"/>
<section xml:id="container-server-conf"> <section xml:id="container-server-conf">
<title>Sample container server configuration file</title> <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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/liberty"/></programlisting>
</section> </section>
</section> </section>
@ -115,7 +115,7 @@
href="../common/tables/swift-container-sync-realms-realm2.xml"/> href="../common/tables/swift-container-sync-realms-realm2.xml"/>
<section xml:id="container-sync-realms-conf"> <section xml:id="container-sync-realms-conf">
<title>Sample container sync realms configuration file</title> <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/kilo"/></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/liberty"/></programlisting>
</section> </section>
</section> </section>
<section xml:id="container-reconciler-configuration"> <section xml:id="container-reconciler-configuration">
@ -140,7 +140,7 @@
href="../common/tables/swift-container-reconciler-pipeline-main.xml"/> href="../common/tables/swift-container-reconciler-pipeline-main.xml"/>
<section xml:id="container-reconciler-conf"> <section xml:id="container-reconciler-conf">
<title>Sample container sync reconciler configuration file</title> <title>Sample container sync reconciler configuration file</title>
<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> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/liberty"/></programlisting>
</section> </section>
</section> </section>
@ -170,7 +170,7 @@
href="../common/tables/swift-account-server-filter-xprofile.xml"/> href="../common/tables/swift-account-server-filter-xprofile.xml"/>
<section xml:id="account-server-conf"> <section xml:id="account-server-conf">
<title>Sample account server configuration file</title> <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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/liberty"/></programlisting>
</section> </section>
</section> </section>
<section xml:id="proxy-server-configuration"> <section xml:id="proxy-server-configuration">
@ -213,7 +213,7 @@
href="../common/tables/swift-proxy-server-filter-xprofile.xml"/> href="../common/tables/swift-proxy-server-filter-xprofile.xml"/>
<section xml:id="proxy-server-conf"> <section xml:id="proxy-server-conf">
<title>Sample proxy server configuration file</title> <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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/liberty"/></programlisting>
</section> </section>
</section> </section>
<section xml:id="swift-memcache-configuration"> <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 <para>The Compute service stores its API configuration settings in the
<filename>api-paste.ini</filename> file.</para> <filename>api-paste.ini</filename> file.</para>
<programlisting language="ini"> <programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/api-paste.ini?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/api-paste.ini?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
<section xml:id="section_nova-policy.json"> <section xml:id="section_nova-policy.json">
<title>policy.json</title> <title>policy.json</title>
<para>The <filename>policy.json</filename> file defines additional access controls that apply to the Compute service.</para> <para>The <filename>policy.json</filename> file defines additional access controls that apply to the Compute service.</para>
<programlisting language="json"> <programlisting language="json">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/policy.json?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/policy.json?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
<section xml:id="section_nova-rootwrap.conf"> <section xml:id="section_nova-rootwrap.conf">
@ -30,7 +30,7 @@
option in the <option>[workaround]</option> section option in the <option>[workaround]</option> section
of the <filename>nova.conf</filename> configuration file.</para> of the <filename>nova.conf</filename> configuration file.</para>
<programlisting language="ini"> <programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/rootwrap.conf?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/rootwrap.conf?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
</section> </section>

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

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

14
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 <para>The configuration file for the Image service API is found in the
<filename>glance-api.conf</filename> file.</para> <filename>glance-api.conf</filename> file.</para>
<para>This file must be modified after installation.</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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api.conf?h=stable/liberty"/></programlisting>
</section> </section>
<section xml:id="section_glance-registry.conf"> <section xml:id="section_glance-registry.conf">
<title>glance-registry.conf</title> <title>glance-registry.conf</title>
@ -20,14 +20,14 @@
stores the metadata about images, is found in the stores the metadata about images, is found in the
<filename>glance-registry.conf</filename> file.</para> <filename>glance-registry.conf</filename> file.</para>
<para>This file must be modified after installation.</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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry.conf?h=stable/liberty"/></programlisting>
</section> </section>
<section xml:id="section_glance-api-paste.conf"> <section xml:id="section_glance-api-paste.conf">
<title>glance-api-paste.ini</title> <title>glance-api-paste.ini</title>
<para>Configuration for the Image service's API middleware pipeline is found in the <para>Configuration for the Image service's API middleware pipeline is found in the
<filename>glance-api-paste.ini</filename> file.</para> <filename>glance-api-paste.ini</filename> file.</para>
<para>You should not need to modify this 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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api-paste.ini?h=stable/liberty"/></programlisting>
</section> </section>
<section xml:id="section_glance-manage.conf"> <section xml:id="section_glance-manage.conf">
<title>glance-manage.conf</title> <title>glance-manage.conf</title>
@ -38,24 +38,24 @@
<filename>glance-registry.conf</filename> and <filename>glance-api.conf</filename>. <filename>glance-registry.conf</filename> and <filename>glance-api.conf</filename>.
Similarly, options in <filename>glance-api.conf</filename> will Similarly, options in <filename>glance-api.conf</filename> will
override options set in <filename>glance-registry.conf</filename>.</para></note> override options set in <filename>glance-registry.conf</filename>.</para></note>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-manage.conf"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-manage.conf?h=stable/liberty"/></programlisting>
</section> </section>
<section xml:id="section_glance-registry-paste.conf"> <section xml:id="section_glance-registry-paste.conf">
<title>glance-registry-paste.ini</title> <title>glance-registry-paste.ini</title>
<para>The Image service's middleware pipeline for its registry is found in the <para>The Image service's middleware pipeline for its registry is found in the
<filename>glance-registry-paste.ini</filename> file.</para> <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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry-paste.ini?h=stable/liberty"/></programlisting>
</section> </section>
<section xml:id="section_glance-scrubber.conf"> <section xml:id="section_glance-scrubber.conf">
<title>glance-scrubber.conf</title> <title>glance-scrubber.conf</title>
<para><command>glance-scrubber</command> is a utility for the Image service that cleans up images that have been deleted; its configuration is stored in the <para><command>glance-scrubber</command> is a utility for the Image service that cleans up images that have been deleted; its configuration is stored in the
<filename>glance-scrubber.conf</filename> file.</para> <filename>glance-scrubber.conf</filename> file.</para>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/liberty"/></programlisting>
</section> </section>
<section xml:id="section_glance-policy.json"> <section xml:id="section_glance-policy.json">
<title>policy.json</title> <title>policy.json</title>
<para>The <filename>/etc/glance/policy.json</filename> file defines additional access controls <para>The <filename>/etc/glance/policy.json</filename> file defines additional access controls
that apply to the Image service.</para> 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/kilo"/></programlisting> <programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=stable/liberty"/></programlisting>
</section> </section>
</section> </section>

1
doc/config-reference/networking/section_networking-plugins.xml
View File

@ -15,6 +15,7 @@
L2-in-L3 tunneling or OpenFlow. These sections L2-in-L3 tunneling or OpenFlow. These sections
detail the configuration options for the various detail the configuration options for the various
plug-ins.</para> plug-ins.</para>
<!-- TODO: Update this section for Liberty -->
<note><para>The following plugins have been removed in <note><para>The following plugins have been removed in
Kilo:</para> Kilo:</para>
<itemizedlist> <itemizedlist>

14
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 <para>Use the <filename>neutron.conf</filename> file to configure the
majority of the OpenStack Networking options.</para> majority of the OpenStack Networking options.</para>
<programlisting language="ini"> <programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/neutron.conf?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/neutron.conf?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
<section xml:id="section_neutron-api-paste.ini"> <section xml:id="section_neutron-api-paste.ini">
<title>api-paste.ini</title> <title>api-paste.ini</title>
<para>Use the <filename>api-paste.ini</filename> to configure the OpenStack Networking API.</para> <para>Use the <filename>api-paste.ini</filename> to configure the OpenStack Networking API.</para>
<programlisting language="ini"> <programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/api-paste.ini?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/api-paste.ini?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
<section xml:id="section_neutron-policy.json"> <section xml:id="section_neutron-policy.json">
@ -25,7 +25,7 @@
<para>Use the <filename>policy.json</filename> file to define additional access controls <para>Use the <filename>policy.json</filename> file to define additional access controls
that apply to the OpenStack Networking service.</para> that apply to the OpenStack Networking service.</para>
<programlisting language="json"> <programlisting language="json">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
<section xml:id="section_neutron-rootwrap.conf"> <section xml:id="section_neutron-rootwrap.conf">
@ -34,7 +34,7 @@
<command>rootwrap</command> script when the OpenStack Networking service must escalate its <command>rootwrap</command> script when the OpenStack Networking service must escalate its
privileges to those of the root user.</para> privileges to those of the root user.</para>
<programlisting language="ini"> <programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/rootwrap.conf?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/rootwrap.conf?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
<section xml:id="section_plugin-agent-conf"> <section xml:id="section_plugin-agent-conf">
@ -45,19 +45,19 @@
<section xml:id="section_neutron-dhcp_agent.ini"> <section xml:id="section_neutron-dhcp_agent.ini">
<title>dhcp_agent.ini</title> <title>dhcp_agent.ini</title>
<programlisting language="ini"> <programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/dhcp_agent.ini?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/dhcp_agent.ini?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
<section xml:id="section_neutron-l3_agent.ini.conf"> <section xml:id="section_neutron-l3_agent.ini.conf">
<title>l3_agent.ini</title> <title>l3_agent.ini</title>
<programlisting language="ini"> <programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/l3_agent.ini?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/l3_agent.ini?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
<section xml:id="section_neutron-metadata_agent.ini"> <section xml:id="section_neutron-metadata_agent.ini">
<title>metadata_agent.ini</title> <title>metadata_agent.ini</title>
<programlisting language="ini"> <programlisting language="ini">
<xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/metadata_agent.ini?h=stable/kilo"/> <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/metadata_agent.ini?h=stable/liberty"/>
</programlisting> </programlisting>
</section> </section>
</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 <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 may be of interest. This file can be modified to add and drop traits
that operators may find useful.</para> 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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/event_definitions.yaml?h=stable/liberty"/></programlisting>
</section> </section>
<section xml:id="section_pipeline.yaml"> <section xml:id="section_pipeline.yaml">
<title>pipeline.yaml</title> <title>pipeline.yaml</title>
@ -34,7 +34,7 @@
file.</para> file.</para>
<para>This file can be modified to adjust polling intervals and the <para>This file can be modified to adjust polling intervals and the
samples generated by the Telemetry module</para> 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/kilo"/></programlisting> <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml?h=stable/liberty"/></programlisting>
</section> </section>
<section xml:id="section_event_pipeline.yaml"> <section xml:id="section_event_pipeline.yaml">
<title>event_pipeline.yaml</title> <title>event_pipeline.yaml</title>
@ -49,7 +49,7 @@
<title>policy.json</title> <title>policy.json</title>
<para>The <filename>policy.json</filename> file defines additional <para>The <filename>policy.json</filename> file defines additional
access controls that apply to the Telemetry service.</para> 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/kilo"/></programlisting> <programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/policy.json?h=stable/liberty"/></programlisting>
</section> </section>
<!-- TODO(gpocentek): include sources.json --> <!-- TODO(gpocentek): include sources.json -->
</section> </section>

8
doc/contributor-guide/source/content-specs.rst
View File

@ -151,11 +151,11 @@ This guide has a review in place to get a license indicator in output:
.. Links .. Links
.. _`Installation Guide for openSUSE and SUSE Linux Enterprise Server`: http://docs.openstack.org/kilo/install-guide/install/zypper/content/ .. _`Installation Guide for openSUSE and SUSE Linux Enterprise Server`: http://docs.openstack.org/liberty/install-guide-obs/
.. _`Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora`: http://docs.openstack.org/kilo/install-guide/install/yum/content/ .. _`Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora`: http://docs.openstack.org/liberty/install-guide-rdo/
.. _`Installation Guide for Ubuntu 12.04 and 14.04 (LTS) Server`: http://docs.openstack.org/kilo/install-guide/install/apt/content/ .. _`Installation Guide for Ubuntu 12.04 and 14.04 (LTS) Server`: http://docs.openstack.org/liberty/install-guide-ubuntu/
.. _`OpenStack Configuration Reference`: http://docs.openstack.org/kilo/config-reference/content/ .. _`OpenStack Configuration Reference`: http://docs.openstack.org/liberty/config-reference/content/
.. _`release information`: https://wiki.openstack.org/wiki/Releases .. _`release information`: https://wiki.openstack.org/wiki/Releases

12
doc/contributor-guide/source/docs_builds.rst
View File

@ -46,15 +46,15 @@ like the example above of stable/kilo.
* - Installation Guide for openSUSE and SUSE Linux Enterprise Server * - Installation Guide for openSUSE and SUSE Linux Enterprise Server
- http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide
- http://docs.openstack.org/kilo/install-guide/install/zypper/content - http://docs.openstack.org/liberty/install-guide-obs
* - Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora * - Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora
- http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide
- http://docs.openstack.org/kilo/install-guide/install/yum/content - http://docs.openstack.org/kilo/install-guide-rdo
* - Installation Guide for Ubuntu 14.04 (LTS) * - Installation Guide for Ubuntu 14.04 (LTS)
- http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide
- http://docs.openstack.org/kilo/install-guide/install/apt/content - http://docs.openstack.org/kilo/install-guide-ubuntu
Guides for deployers and administrators Guides for deployers and administrators
--------------------------------------- ---------------------------------------
@ -72,7 +72,7 @@ Guides for deployers and administrators
* - Configuration Reference * - Configuration Reference
- http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/config-reference - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/config-reference
- http://docs.openstack.org/kilo/config-reference/content - http://docs.openstack.org/liberty/config-reference/content
* - Cloud Administrator Guide * - Cloud Administrator Guide
- http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/admin-guide-cloud - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/admin-guide-cloud
@ -201,8 +201,8 @@ file contain the Jenkins build jobs that build to the docs.openstack.org
and developer.openstack.org sites, copying built files via FTP. and developer.openstack.org sites, copying built files via FTP.
The release specific books are build for the currently supported branches The release specific books are build for the currently supported branches
(juno, kilo), development happens on the master branch. The continuously (juno, kilo, liberty), development happens on the master branch. The
released books are only build on the master branch. continuously released books are only build on the master branch.
Maven plug-in Maven plug-in
~~~~~~~~~~~~~ ~~~~~~~~~~~~~

6
doc/networking-guide/source/adv_config_ipv6.rst
View File

@ -12,7 +12,7 @@ The basics
~~~~~~~~~~ ~~~~~~~~~~
OpenStack Networking has supported IPv6 tenant subnets in certain OpenStack Networking has supported IPv6 tenant subnets in certain
configurations since Juno, but the Kilo release adds a number of new configurations since Juno, but later releases added a number of new
features, functionality and bug fixes to make it more robust. The features, functionality and bug fixes to make it more robust. The
focus of this page will be: focus of this page will be:
@ -457,8 +457,8 @@ external (to the OpenStack Networking service) DHCPv6 server to manage your
tenant network prefixes. tenant network prefixes.
.. note:: .. note::
Prefix delegation will be in the upcoming Liberty release, it is Prefix delegation became available in the Liberty release, it is
not available in the current OpenStack Kilo release. HA and DVR routers not available in the Kilo release. HA and DVR routers
are not currently supported by this feature. are not currently supported by this feature.
Configuring OpenStack Networking for prefix delegation Configuring OpenStack Networking for prefix delegation

2
doc/networking-guide/source/config.rst
View File

@ -4,7 +4,7 @@ Configuration
This content currently under development. For general configuration, see This content currently under development. For general configuration, see
the `Configuration Reference the `Configuration Reference
<http://docs.openstack.org/kilo/config-reference/content/>`_. <http://docs.openstack.org/liberty/config-reference/content/>`_.
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2

4
doc/networking-guide/source/intro_basic_networking.rst
View File

@ -397,8 +397,8 @@ services. See `Appendix B. Firewalls and default ports`_ of the
various services involved in an OpenStack deployment. various services involved in an OpenStack deployment.
.. _registry of port numbers: http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml .. _registry of port numbers: http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml
.. _Appendix B. Firewalls and default ports: http://docs.openstack.org/kilo/config-reference/content/firewalls-default-ports.html .. _Appendix B. Firewalls and default ports: http://docs.openstack.org/liberty/config-reference/content/firewalls-default-ports.html
.. _OpenStack Configuration Reference: http://docs.openstack.org/kilo/config-reference/content/index.html .. _OpenStack Configuration Reference: http://docs.openstack.org/liberty/config-reference/content/index.html
The most common application programming interface (API) for writing TCP-based The most common application programming interface (API) for writing TCP-based

4
doc/networking-guide/source/scenario_dvr_ovs.rst
View File

@ -21,8 +21,8 @@ routing and SNAT services between project and external networks.
.. note:: .. note::
In the Juno (initial) release, DVR supports VXLAN and GRE project networks. In the Juno (initial) release, DVR supports VXLAN and GRE project networks.
In the Kilo release, DVR adds support for VLAN project networks. All In the Kilo release, support was added for DVR with VLAN project networks.
releases support flat and VLAN external networks. All releases support flat and VLAN external networks.
Prerequisites Prerequisites
~~~~~~~~~~~~~ ~~~~~~~~~~~~~

4
doc/networking-guide/source/scenario_l3ha_lb.rst
View File

@ -19,7 +19,7 @@ constraints and to improve scaling. Also, this implementation does not address
situations where one or more layer-3 agents fail and the underlying virtual situations where one or more layer-3 agents fail and the underlying virtual
networks continue to operate normally. Consider deploying networks continue to operate normally. Consider deploying
:doc:`scenario_dvr_ovs` to increase performance in addition to redundancy. As :doc:`scenario_dvr_ovs` to increase performance in addition to redundancy. As
of the Kilo release, you cannot combine the DVR and L3HA mechanisms. of the Liberty release, you cannot combine the DVR and L3HA mechanisms.
.. note:: .. note::
The failover process only retains the state of network connections for The failover process only retains the state of network connections for
@ -30,7 +30,7 @@ project (tenant) network. However, this configuration also supports VLAN
external and project networks. external and project networks.
.. note:: .. note::
In the Juno (initial) and Kilo releases, L3HA with Linux bridge supports In the releases prior to Liberty, L3HA with Linux bridge supports
VLAN and VXLAN project networks. However, due to a bug, VXLAN project VLAN and VXLAN project networks. However, due to a bug, VXLAN project
networks must use multicast instead of the layer-2 population mechanism. networks must use multicast instead of the layer-2 population mechanism.

4
doc/networking-guide/source/scenario_l3ha_ovs.rst
View File

@ -19,7 +19,7 @@ constraints and to improve scaling. Also, this implementation does not address
situations where one or more layer-3 agents fail and the underlying virtual situations where one or more layer-3 agents fail and the underlying virtual
networks continue to operate normally. Consider deploying networks continue to operate normally. Consider deploying
:doc:`scenario_dvr_ovs` to increase performance in addition to redundancy. As :doc:`scenario_dvr_ovs` to increase performance in addition to redundancy. As
of the Kilo release, you cannot combine the DVR and L3HA mechanisms. of the Liberty release, you cannot combine the DVR and L3HA mechanisms.
.. note:: .. note::
The failover process only retains the state of network connections for The failover process only retains the state of network connections for
@ -30,7 +30,7 @@ project (tenant) network. However, this configuration also supports VLAN
external networks, VLAN project networks, and GRE project networks. external networks, VLAN project networks, and GRE project networks.
.. note:: .. note::
Due to a bug in the Juno (initial) and Kilo releases, VXLAN and GRE project Due to a bug in releases prior to Liberty, VXLAN and GRE project
networks must use multicast instead of the layer-2 population mechanism. networks must use multicast instead of the layer-2 population mechanism.
.. todo: .. todo:

2
doc/user-guide-admin/source/cli_cinder_quotas.rst
View File

@ -78,7 +78,7 @@ service quotas.
update the property in the :guilabel:`cinder.quota` update the property in the :guilabel:`cinder.quota`
section of the :file:`/etc/cinder/cinder.conf` file. section of the :file:`/etc/cinder/cinder.conf` file.
For more information, see the `Block Storage For more information, see the `Block Storage
Configuration Reference <http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-block-storage.html>`_. Configuration Reference <http://docs.openstack.org/liberty/config-reference/content/ch_configuring-openstack-block-storage.html>`_.
#. To update Block Storage service quotas, place #. To update Block Storage service quotas, place
the tenant ID in a variable:: the tenant ID in a variable::

2
doc/user-guide-admin/source/dashboard_manage_host_aggregates.rst
View File

@ -11,7 +11,7 @@ multiple aggregates.
The scheduler uses this information to make scheduling decisions. For The scheduler uses this information to make scheduling decisions. For
information, see information, see
`Scheduling <http://docs.openstack.org/kilo/config-reference/content/section_compute-scheduler.html>`__. `Scheduling <http://docs.openstack.org/liberty/config-reference/content/section_compute-scheduler.html>`__.
To create a host aggregate To create a host aggregate
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~

2
doc/user-guide/source/cli_change_the_size_of_your_server.rst
View File

@ -74,7 +74,7 @@ Change the size of a server by changing its flavor.
period (in seconds) a guest operation system is allowed period (in seconds) a guest operation system is allowed
to complete the shutdown. The default timeout is 60 seconds. to complete the shutdown. The default timeout is 60 seconds.
See `Description of Compute configuration options See `Description of Compute configuration options
<http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html>`_ <http://docs.openstack.org/liberty/config-reference/content/list-of-compute-config-options.html>`_
for details. for details.
The timeout value can be overridden on a per image basis The timeout value can be overridden on a per image basis

2
doc/user-guide/source/cli_config_drive.rst
View File

@ -276,7 +276,7 @@ If you choose VFAT, the configuration drive is 64 MB.
.. note:: .. note::
In current version (Kilo) of OpenStack Compute, live migration with In current version (Liberty) of OpenStack Compute, live migration with
``config_drive`` on local disk is forbidden due to the bug in libvirt ``config_drive`` on local disk is forbidden due to the bug in libvirt
of copying a read-only disk. However, if we use VFAT as the format of of copying a read-only disk. However, if we use VFAT as the format of
``config_drive``, the function of live migration works well. ``config_drive``, the function of live migration works well.

2
doc/user-guide/source/cli_reboot_an_instance.rst
View File

@ -48,7 +48,7 @@ command::
a guest operation system is allowed to complete the shutdown. a guest operation system is allowed to complete the shutdown.
The default timeout is 60 seconds. See `Description of The default timeout is 60 seconds. See `Description of
Compute configuration options Compute configuration options
<http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html>`_ <http://docs.openstack.org/liberty/config-reference/content/list-of-compute-config-options.html>`_
for details. for details.
The timeout value can be overridden on a per image basis The timeout value can be overridden on a per image basis

2
doc/user-guide/source/cli_stop_and_start_an_instance.rst
View File

@ -60,7 +60,7 @@ You can run the following shelving tasks:
period (in seconds) a guest operation system is allowed period (in seconds) a guest operation system is allowed
to complete the shutdown. The default timeout is 60 seconds. to complete the shutdown. The default timeout is 60 seconds.
See `Description of Compute configuration options See `Description of Compute configuration options
<http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html>`_ <http://docs.openstack.org/liberty/config-reference/content/list-of-compute-config-options.html>`_
for details. for details.
The timeout value can be overridden on a per image basis The timeout value can be overridden on a per image basis

4
doc/user-guide/source/cli_swift_static_website.rst
View File

@ -20,9 +20,9 @@ The Static Web filter must be added to the pipeline in your
middleware. You must also add a Static Web middleware configuration middleware. You must also add a Static Web middleware configuration
section. section.
See the Cloud Administrator Guide for an example of the `static web configuration syntax <http://docs.openstack.org/kilo/config-reference/content/object-storage-static-web.html>`_. See the Cloud Administrator Guide for an example of the `static web configuration syntax <http://docs.openstack.org/liberty/config-reference/content/object-storage-static-web.html>`_.
See the Cloud Administrator Guide for a complete example of the `/etc/swift/proxy-server.conf file <http://docs.openstack.org/kilo/config-reference/content/proxy-server-conf.html>`_ (including static web). See the Cloud Administrator Guide for a complete example of the `/etc/swift/proxy-server.conf file <http://docs.openstack.org/liberty/config-reference/content/proxy-server-conf.html>`_ (including static web).
Your publicly readable containers are checked for two headers, Your publicly readable containers are checked for two headers,
``X-Container-Meta-Web-Index`` and ``X-Container-Meta-Web-Error``. The ``X-Container-Meta-Web-Index`` and ``X-Container-Meta-Web-Error``. The