From c9864b7b6ae684b0240ba9ed46ccb67bd8f4a61a Mon Sep 17 00:00:00 2001
From: "huang.zhiping" <huang.zhiping@99cloud.net>
Date: Tue, 21 Aug 2018 13:22:02 +0000
Subject: [PATCH] switch documentation job to new PTI

This is a mechanically generated patch to switch the documentation
jobs to use the new PTI versions of the jobs as part of the
python3-first goal.

See the python3-first goal document for details:
https://governance.openstack.org/tc/goals/stein/python3-first.html

Fixes tox-docs building:
* wrap overlong lines
* move doc8 to linters target following PTI.

Change-Id: I54bde3820722bf981913ff8816fd1670f9d3c17a
Story: #2002586
Task: #24319
---
 doc/source/configure-octavia.rst | 17 ++++++++++-------
 tox.ini                          |  3 ++-
 zuul.d/project.yaml              |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/doc/source/configure-octavia.rst b/doc/source/configure-octavia.rst
index c2ed4db6..7dc7a048 100644
--- a/doc/source/configure-octavia.rst
+++ b/doc/source/configure-octavia.rst
@@ -153,19 +153,22 @@ Here is a script to perform all those tasks at once:
             --container-format bare --tags octavia-amphora-image </var/lib/octavia/amphora-x64-haproxy.qcow2
 
 .. note::
-    If you have trouble installing dib-utils from pipy consider installing it directly from source
-    ` pip install git+https://github.com/openstack/dib-utils.git`
+    If you have trouble installing dib-utils from pipy consider
+    installing it directly from source
+    `pip install git+https://github.com/openstack/dib-utils.git`
 
 Creating the cryptographic certificates
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. note::
-    For production installation make sure that you review this very carefully with your
-    own security requirements and potantially use your own CA to sign the certificates.
+    For production installation make sure that you review this very
+    carefully with your own security requirements and potantially use
+    your own CA to sign the certificates.
 
-The system will automatically generate and use self-signed certificates with different
-Certificate Authorities for control plane and amphora. Make sure to store a copy in
-a safe place for potential disaster recovery.
+The system will automatically generate and use self-signed
+certificates with different Certificate Authorities for control plane
+and amphora. Make sure to store a copy in a safe place for potential
+disaster recovery.
 
 Optional: Configuring Octavia with ssh access to the amphora
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tox.ini b/tox.ini
index d893fb5c..e97de312 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,6 @@ basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands=
     bash -c "rm -rf doc/build"
-    doc8 doc
     sphinx-build -b html doc/source doc/build/html
 
 
@@ -103,3 +102,5 @@ commands =
     {[testenv:bashate]commands}
     {[testenv:ansible-lint]commands}
     {[testenv:ansible-syntax]commands}
+    doc8 doc
+
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3ed6375f..e17607fa 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -15,8 +15,8 @@
 - project:
     templates:
       - check-requirements
-      - publish-openstack-sphinx-docs
-      - release-notes-jobs
+      - publish-openstack-docs-pti
+      - release-notes-jobs-python3
     check:
       jobs:
         - openstack-ansible-linters