diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-28 06:46:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-28 06:46:24 +0000 |
| commit | 93ed9474b504fc16a7ce313c01cb30ec345e9fcb (patch) | |
| tree | 2227556f9c55da1d0bc1bff64df9609d81ba75ad /doc/source/admin | |
| parent | b27e99c2b3f83b714759f023ffc3e80842ea930e (diff) | |
| parent | ae1e2e680867559fb97da869086ccfcfc4cbd62d (diff) | |
| download | kolla-93ed9474b504fc16a7ce313c01cb30ec345e9fcb.tar.gz kolla-93ed9474b504fc16a7ce313c01cb30ec345e9fcb.zip | |
Merge "doc: Start using openstackdoctheme's extlink extension"
Diffstat (limited to 'doc/source/admin')
| -rw-r--r-- | doc/source/admin/image-building.rst | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst index 1f099802b..a0b756c8c 100644 --- a/doc/source/admin/image-building.rst +++ b/doc/source/admin/image-building.rst @@ -1,5 +1,3 @@ -.. _image-building: - ========================= Building Container Images ========================= @@ -151,9 +149,8 @@ repository named ``mykollarepo``: kolla-build -n mykollarepo --push -To push images to a `local registry -<https://docs.openstack.org/kolla-ansible/latest/user/multinode.html#deploy-a-registry>`_, -use ``--registry`` flag: +To push images to a :kolla-ansible-doc:`local registry +<user/multinode.html#deploy-a-registry>`, use ``--registry`` flag: .. code-block:: console @@ -217,6 +214,8 @@ overrides file, add the following: RUN subscription-manager register --user=<user-name> \ --password=<password> && subscription-manager attach --pool <pool-id> +.. _dockerfile-customisation: + Dockerfile Customisation ======================== @@ -534,9 +533,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 -`Docker Insecure Registry -<https://docs.openstack.org/kolla-ansible/latest/user/multinode.html#deploy-a-registry>`_. +insecure registry. See :kolla-ansible-doc:`Docker Insecure Registry +<user/multinode.html#deploy-a-registry>`. Building behind a proxy ----------------------- |