openstack/openstack-manuals
Code Issues Proposed changes

Merge "[install-guides] make pipeline configuration actual one line"

Browse Source
This commit is contained in:
Jenkins 2016-03-18 03:25:43 +00:00 committed by Gerrit Code Review
commit e606edac00
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/install-guide/source/ceilometer-swift.rst
View File

@ -87,13 +87,10 @@ run the Object Storage proxy service.
* In the ``[pipeline:main]`` section, add ``ceilometer``: * In the ``[pipeline:main]`` section, add ``ceilometer``:
.. code-block:: ini .. code-block:: ini
[pipeline:main] [pipeline:main]
pipeline = catch_errors gatekeeper healthcheck proxy-logging cache pipeline = ceilometer catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk ratelimit authtoken keystoneauth container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
container_sync bulk ratelimit authtoken keystoneauth container-quotas
account-quotas slo dlo versioned_writes proxy-logging ceilometer
proxy-server
* In the ``[filter:ceilometer]`` section, configure notifications: * In the ``[filter:ceilometer]`` section, configure notifications:

4
doc/install-guide/source/swift-controller-include.txt
View File

@ -19,9 +19,7 @@ following actions:
.. code-block:: ini .. code-block:: ini
[pipeline:main] [pipeline:main]
pipeline = catch_errors gatekeeper healthcheck proxy-logging cache pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk ratelimit authtoken keystoneauth container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
container_sync bulk ratelimit authtoken keystoneauth container-quotas
account-quotas slo dlo versioned_writes proxy-logging proxy-server
.. note:: .. note::

2
tox.ini
View File

@ -123,7 +123,7 @@ commands = {toxinidir}/tools/generatepot-rst.sh openstack-manuals 1 {posargs}
# Settings for doc8: # Settings for doc8:
# Ignore target directories # Ignore target directories
# TODO(samos123): remove sriov from ignore when fix for #1487302 is in doc8 # TODO(samos123): remove sriov from ignore when fix for #1487302 is in doc8
ignore-path = doc/*/target,doc/*/build*,doc/common/glossary.rst,doc/networking-guide/source/adv-config-sriov.rst ignore-path = doc/*/target,doc/*/build*,doc/common/glossary.rst,doc/networking-guide/source/adv-config-sriov.rst,doc/install-guide/source/swift-controller-include.txt
# File extensions to use # File extensions to use
extensions = .rst,.txt extensions = .rst,.txt
# Maximal line length should be 79 but we have some overlong lines. # Maximal line length should be 79 but we have some overlong lines.