diff options
| author | chenxing <chason.chan@foxmail.com> | 2019-06-14 19:10:25 +0800 |
|---|---|---|
| committer | chenxing <chason.chan@foxmail.com> | 2019-06-14 21:23:10 +0800 |
| commit | ae1e2e680867559fb97da869086ccfcfc4cbd62d (patch) | |
| tree | f114eae126cd0fa3f0ce1bb9ffe2b56de692de39 /doc/source/admin | |
| parent | 39a2cf066c4c79436629017155302d36243aa338 (diff) | |
| download | kolla-ae1e2e680867559fb97da869086ccfcfc4cbd62d.tar.gz kolla-ae1e2e680867559fb97da869086ccfcfc4cbd62d.zip | |
doc: Start using openstackdoctheme's extlink extension
This ensures we have version-specific references to other projects [1].
Note that this doesn't mean the URLs are actually valid - we need to do
more work (linkcheck?) here, but it's an improvement nonetheless.
[1] https://docs.openstack.org/openstackdocstheme/latest/#external-link-helper
Change-Id: I7c979dacd89ebead404b751d596ba120b38f00f3
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 ----------------------- |