Rearrange existing documentation to fit the new standard layout
For more detail, see the doc migration spec.
http://specs.openstack.org/openstack/docs-specs/specs/pike/os-manuals-migration.html
Partially-Implements: blueprint queens-doc-restructure
Co-Authored-By: Kurt Taylor <kurt.r.taylor@gmail.com>
Change-Id: Iab93bf023a13b953a31152b91d4fea0fa75bf2d0
(cherry picked from commit 5493fb64e1
)
This commit is contained in:
parent
0ed018df42
commit
d2df6f7b2e
|
@ -96,7 +96,9 @@ repository named ``mykollarepo``::
|
|||
|
||||
kolla-build -n mykollarepo --push
|
||||
|
||||
To push images to a :ref:`local registry<deploy_a_registry>`, use
|
||||
To push images to a `local registry
|
||||
<https://docs.openstack.org/kolla-ansible/latest/user/multinode.html#deploy-a-registry>`_,
|
||||
use
|
||||
``--registry`` flag::
|
||||
|
||||
kolla-build --registry 172.22.2.81:5000 --push
|
||||
|
@ -358,8 +360,8 @@ Kolla-ansible with Local Registry
|
|||
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>`.
|
||||
insecure registry. See `Docker Insecure Registry Config
|
||||
<https://docs.openstack.org/kolla-ansible/latest/user/multinode.html#deploy-a-registry>`_.
|
||||
|
||||
Building behind a proxy
|
||||
-----------------------
|
|
@ -0,0 +1,17 @@
|
|||
===================
|
||||
Administrator Guide
|
||||
===================
|
||||
|
||||
Building Container Images
|
||||
-------------------------
|
||||
|
||||
If you are a system administrator running Kolla, this section contains
|
||||
information that should help you understand how to build container image
|
||||
or build some images using ``--template-override``.
|
||||
|
||||
|
||||
.. toctree::
|
||||
:maxdepth: 2
|
||||
:glob:
|
||||
|
||||
image-building
|
|
@ -0,0 +1,17 @@
|
|||
============
|
||||
Development
|
||||
============
|
||||
|
||||
Contributing
|
||||
------------
|
||||
|
||||
This guide is to tell someone who would like to contribute to
|
||||
Kolla project. Following this guide to propose your first patch for Kolla.
|
||||
And we are welcome everyone to join our project!
|
||||
|
||||
.. toctree::
|
||||
:maxdepth: 2
|
||||
|
||||
CONTRIBUTING.rst
|
||||
running-tests
|
||||
bug-triage
|
|
@ -37,21 +37,18 @@ example:
|
|||
|
||||
http://docs.openstack.org/developer/kolla/mitaka/
|
||||
|
||||
|
||||
Kolla Overview
|
||||
==============
|
||||
Administrator Guide
|
||||
===================
|
||||
|
||||
.. toctree::
|
||||
:maxdepth: 1
|
||||
:maxdepth: 2
|
||||
|
||||
image-building
|
||||
admin/index
|
||||
|
||||
Developer Docs
|
||||
==============
|
||||
Contributor Guide
|
||||
=================
|
||||
|
||||
.. toctree::
|
||||
:maxdepth: 1
|
||||
:maxdepth: 2
|
||||
|
||||
CONTRIBUTING
|
||||
running-tests
|
||||
bug-triage
|
||||
contributor/index
|
Loading…
Reference in New Issue