Skip to content

Commit

Permalink
Replace references to Docker Hub by Quay.io
Browse files Browse the repository at this point in the history
Kolla Ansible uses Quay.io as its default registry.

Change-Id: Ie1a56ebd6fe3283a2b5b077f658ff1cf3e006784
  • Loading branch information
priteau committed Jan 6, 2023
1 parent ee25470 commit 6e78aa8
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion doc/source/configuration/reference/kolla-ansible.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions doc/source/deployment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions doc/source/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'.
Expand Down

0 comments on commit 6e78aa8

Please sign in to comment.