Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronise yoga with upstream #88

Merged
merged 2 commits into from
Jan 24, 2023
Merged

Synchronise yoga with upstream #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e020633
Replace references to Docker Hub by Quay.io
priteau Jan 6, 2023
6ee4652
Merge "Replace references to Docker Hub by Quay.io" into stable/yoga
Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/source/configuration/reference/kolla-ansible.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ accessed.
``source``.
``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
View file
Open in desktop
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 @@ -516,7 +516,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 @@ -548,12 +548,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,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 @@ -382,7 +382,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 @@ -404,12 +404,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#kolla_install_type:

# 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