openstack
/
kayobe
Code Issues Proposed changes

Merge "Don't pull registry image from private registry"

This commit is contained in:
Zuul 2019-02-08 17:31:06 +00:00 committed by Gerrit Code Review
parent 99ddd5c41b 3b1a8a6a00
commit d6727debcd
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/docker-registry/defaults/main.yml
View File

@ -39,7 +39,7 @@ docker_registry_port: 5000
# NOTE: Namespace 'library' causes image task to always be changed and # NOTE: Namespace 'library' causes image task to always be changed and
# container to never update to new images. # container to never update to new images.
docker_registry_namespace: "" docker_registry_namespace: ""
docker_registry_image: "{{ docker_registry ~ '/' if docker_registry | default else '' }}{{ docker_registry_namespace ~ '/' if docker_registry_namespace else '' }}registry" docker_registry_image: "{{ docker_registry_namespace ~ '/' if docker_registry_namespace else '' }}registry"
docker_registry_tag: "latest" docker_registry_tag: "latest"
docker_registry_image_full: "{{ docker_registry_image }}:{{ docker_registry_tag }}" docker_registry_image_full: "{{ docker_registry_image }}:{{ docker_registry_tag }}"

2
doc/source/configuration/hosts.rst
View File

@ -532,6 +532,8 @@ Kolla-ansible Remote Virtual Environment
See :ref:`configuration-kolla-ansible-venv` for information about remote Python See :ref:`configuration-kolla-ansible-venv` for information about remote Python
virtual environments for Kolla Ansible. virtual environments for Kolla Ansible.
.. _configuration-hosts-docker:
Docker Engine Docker Engine
============= =============

4
doc/source/configuration/kolla.rst
View File

@ -75,8 +75,8 @@ used to generate the Kolla configuration file, ``kolla-build.conf``.
``kolla_docker_namespace`` ``kolla_docker_namespace``
Docker namespace to use for Kolla images. Default is ``kolla``. Docker namespace to use for Kolla images. Default is ``kolla``.
``kolla_docker_registry`` ``kolla_docker_registry``
URL of docker registry to use for Kolla images. Default is not set, in URL of docker registry to use for Kolla images. Default is to use the value
which case Dockerhub will be used. of ``docker_registry`` variable (see :ref:`configuration-hosts-docker`).
``kolla_docker_registry_username`` ``kolla_docker_registry_username``
Username to use to access a docker registry. Default is not set, in which Username to use to access a docker registry. Default is not set, in which
case the registry will be used without authentication. case the registry will be used without authentication.

4
releasenotes/notes/docker-registry-on-seed-2eb4fb643d6fda9a.yaml
View File

@ -7,3 +7,7 @@ upgrade:
the seed group from ``[docker-registry:children]`` in the seed group from ``[docker-registry:children]`` in
``$KAYOBE_CONFIG_PATH/inventory/groups` and creating a ``$KAYOBE_CONFIG_PATH/inventory/groups` and creating a
``[docker-registry]`` group including the name of the first controller. ``[docker-registry]`` group including the name of the first controller.
- |
Modifies the default value of ``docker_registry_image`` variable to not use
a private registry in the image name by default. This avoids a potential
circular dependency during deployment of the registry container.