aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-18 15:07:46 +0000
committerGerrit Code Review <review@openstack.org>2017-07-18 15:07:46 +0000
commitef949dafd79cffd8a708d318ee781d8f0e73e72b (patch)
tree6d314f6b516a59d6664bd4284620faabb4fc4b44
parent7b05e8dbccbff190f85d1d14ff32cef75d78a7ee (diff)
parent5289c6b42854f12bf0b28537fe4d3fc875311f66 (diff)
downloadkolla-ef949dafd79cffd8a708d318ee781d8f0e73e72b.tar.gz
kolla-ef949dafd79cffd8a708d318ee781d8f0e73e72b.zip
Merge "Fix doc build warnings"
-rw-r--r--doc/image-building.rst8
-rw-r--r--setup.cfg1
-rw-r--r--tox.ini1
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/image-building.rst b/doc/image-building.rst
index cd6962b28..074acc902 100644
--- a/doc/image-building.rst
+++ b/doc/image-building.rst
@@ -96,8 +96,9 @@ repository named ``mykollarepo``::
kolla-build -n mykollarepo --push
-To push images to a :ref:`local registry<deploy_a_registry>`, use
-``--registry`` flag::
+To push images to a `local registry
+<https://docs.openstack.org/kolla-ansible/latest/multinode.html#deploy-a-registry>`_,
+use ``--registry`` flag::
kolla-build --registry 172.22.2.81:5000 --push
@@ -415,7 +416,8 @@ To make kolla-ansible pull images from a local registry, set
``"docker_registry"`` to ``"172.22.2.81:5000"`` in
``"/etc/kolla/globals.yml"``. Make sure Docker is allowed to pull images from
insecure registry. See
-:ref:`Docker Insecure Registry Config <deploy_a_registry>`.
+`Docker Insecure Registry
+<https://docs.openstack.org/kolla-ansible/latest/multinode.html#deploy-a-registry>`_.
Building behind a proxy
-----------------------
diff --git a/setup.cfg b/setup.cfg
index 4eefef969..b1825339e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,6 +47,7 @@ setup-hooks =
all_files = 1
build-dir = doc/build
source-dir = doc
+warning-is-error = 1
[build_releasenotes]
all_files = 1
diff --git a/tox.ini b/tox.ini
index 05af3d118..a3e0df0ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,6 +46,7 @@ commands = {posargs}
[testenv:docs]
commands =
+ rm -rf doc/build
doc8 doc
python setup.py build_sphinx