openstack
/
kayobe
Code Issues Proposed changes

Merge "Replace references to Docker Hub by Quay.io"

This commit is contained in:
Zuul 2023-01-09 11:22:27 +00:00 committed by Gerrit Code Review
parent 8640fbd5c0 6e78aa8914
commit ebd5799fd4
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/configuration/reference/kolla-ansible.rst
View File

@ -120,7 +120,7 @@ accessed.
``kolla_base_distro``.
``kolla_docker_registry``
URL of docker registry to use for Kolla images. Default is not set, in
which case Dockerhub will be used.
which case Quay.io will be used.
``kolla_docker_registry_insecure``
Whether docker should be configured to use an insecure registry for Kolla
images. Default is false, unless ``docker_registry_enabled`` is true and

16
doc/source/deployment.rst
View File

@ -140,10 +140,10 @@ Building Container Images
.. note::
It is possible to use prebuilt container images from an image registry such
as Dockerhub. In this case, this step can be skipped.
as Quay.io. In this case, this step can be skipped.
It is possible to use prebuilt container images from an image registry such as
Dockerhub. In some cases it may be necessary to build images locally either to
Quay.io. In some cases it may be necessary to build images locally either to
apply local image customisation or to use a downstream version of kolla.
Images are built by hosts in the ``container-image-builders`` group, which by
default includes the ``seed``.
@ -515,7 +515,7 @@ Building Container Images
.. note::
It is possible to use prebuilt container images from an image registry such
as Dockerhub. In this case, this step can be skipped.
as Quay.io. In this case, this step can be skipped.
In some cases it may be necessary to build images locally either to apply local
image customisation or to use a downstream version of kolla. Images are built
@ -547,12 +547,12 @@ Pulling Container Images
.. note::
It is possible to build container images locally avoiding the need for an
image registry such as Dockerhub. In this case, this step can be skipped.
image registry such as Quay.io. In this case, this step can be skipped.
In most cases suitable prebuilt kolla images will be available on Dockerhub.
The `kolla account <https://hub.docker.com/u/kolla>`_ provides image
repositories suitable for use with kayobe and will be used by default. To
pull images from the configured image registry::
In most cases suitable prebuilt kolla images will be available on Quay.io. The
`openstack.kolla organisation <https://quay.io/organization/openstack.kolla>`_
provides image repositories suitable for use with kayobe and will be used by
default. To pull images from the configured image registry::
(kayobe) $ kayobe overcloud container image pull

14
doc/source/upgrading.rst
View File

@ -267,7 +267,7 @@ Building Container Images
.. note::
It is possible to use prebuilt container images from an image registry such
as Dockerhub. In this case, this step can be skipped.
as Quay.io. In this case, this step can be skipped.
In some cases it may be necessary to build images locally either to apply local
image customisation or to use a downstream version of kolla. To build images
@ -381,7 +381,7 @@ Building Container Images
.. note::
It is possible to use prebuilt container images from an image registry such
as Dockerhub. In this case, this step can be skipped.
as Quay.io. In this case, this step can be skipped.
In some cases it may be necessary to build images locally either to apply local
image customisation or to use a downstream version of kolla. To build images
@ -403,12 +403,12 @@ Pulling Container Images
.. note::
It is possible to build container images locally avoiding the need for an
image registry such as Dockerhub. In this case, this step can be skipped.
image registry such as Quay.io. In this case, this step can be skipped.
In most cases suitable prebuilt kolla images will be available on Dockerhub.
The `kolla account <https://hub.docker.com/u/kolla>`_ provides image
repositories suitable for use with kayobe and will be used by default. To
pull images from the configured image registry::
In most cases suitable prebuilt kolla images will be available on Quay.io. The
`openstack.kolla organisation <https://quay.io/organization/openstack.kolla>`_
provides image repositories suitable for use with kayobe and will be used by
default. To pull images from the configured image registry::
(kayobe) $ kayobe overcloud container image pull

2
etc/kayobe/kolla.yml
View File

@ -79,7 +79,7 @@
#kolla_base_distro_version:
# URL of docker registry to use for Kolla images. Default is not set, in which
# case Dockerhub will be used.
# case Quay.io will be used.
#kolla_docker_registry:
# Docker namespace to use for Kolla images. Default is 'kolla'.