diff --git a/doc/install-guide/source/ceilometer-swift.rst b/doc/install-guide/source/ceilometer-swift.rst index 1c87188075..228aa5b701 100644 --- a/doc/install-guide/source/ceilometer-swift.rst +++ b/doc/install-guide/source/ceilometer-swift.rst @@ -87,13 +87,10 @@ run the Object Storage proxy service. * In the ``[pipeline:main]`` section, add ``ceilometer``: - .. code-block:: ini + .. code-block:: ini [pipeline:main] - pipeline = catch_errors gatekeeper healthcheck proxy-logging cache - container_sync bulk ratelimit authtoken keystoneauth container-quotas - account-quotas slo dlo versioned_writes proxy-logging ceilometer - proxy-server + 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 * In the ``[filter:ceilometer]`` section, configure notifications: diff --git a/doc/install-guide/source/swift-controller-include.txt b/doc/install-guide/source/swift-controller-include.txt index 0373a78437..f71e42b0c8 100644 --- a/doc/install-guide/source/swift-controller-include.txt +++ b/doc/install-guide/source/swift-controller-include.txt @@ -19,9 +19,7 @@ following actions: .. code-block:: ini [pipeline:main] - 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 + 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 .. note:: diff --git a/tox.ini b/tox.ini index 55a26c8524..d0abffcadc 100644 --- a/tox.ini +++ b/tox.ini @@ -123,7 +123,7 @@ commands = {toxinidir}/tools/generatepot-rst.sh openstack-manuals 1 {posargs} # Settings for doc8: # Ignore target directories # 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 extensions = .rst,.txt # Maximal line length should be 79 but we have some overlong lines.