diff --git a/ansible/inventory/group_vars/all/docker b/ansible/inventory/group_vars/all/docker index 820ebbd5eec00a16e2cebab33aeb9a8c5a488016..b9030abc403f2fd0b28ff4d113c1b058e2e984de 100644 --- a/ansible/inventory/group_vars/all/docker +++ b/ansible/inventory/group_vars/all/docker @@ -24,6 +24,11 @@ docker_storage_volume_thinpool_meta_size: 1%VG # URL of docker registry docker_registry: +# Whether docker should be configured to use an insecure registry. +# Default is false, unless docker_registry_enabled is true and +# docker_registry_enable_tls is false. +docker_registry_insecure: "{{ docker_registry_enabled | bool and not docker_registry_enable_tls | bool }}" + # CA of docker registry docker_registry_ca: diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla index df3d012bf0a02250a1b9b769bafe5df4c49cb0de..bdd8f3c7ee691b7310985eb736edc7f3ac16e859 100644 --- a/ansible/inventory/group_vars/all/kolla +++ b/ansible/inventory/group_vars/all/kolla @@ -75,11 +75,6 @@ kolla_docker_namespace: "openstack.kolla" # Url of docker registry to use for Kolla images. kolla_docker_registry: "{{ docker_registry }}" -# Whether docker should be configured to use an insecure registry for Kolla -# images. Default is false, unless docker_registry_enabled is true and -# docker_registry_enable_tls is false. -kolla_docker_registry_insecure: "{{ docker_registry_enabled | bool and not docker_registry_enable_tls | bool }}" - # Username to use to access a docker registry. kolla_docker_registry_username: diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml index bf2b371e7f55d59afd29b370bb8d1fb83d71547b..3d26fa0d30de69edac5b6df0ce181bcdc32ce2e2 100644 --- a/ansible/roles/kolla-ansible/defaults/main.yml +++ b/ansible/roles/kolla-ansible/defaults/main.yml @@ -127,11 +127,6 @@ kolla_docker_namespace: # Url of docker registry to use for Kolla images. kolla_docker_registry: -# Whether docker should be configured to use an insecure registry for Kolla -# images. Default is false, unless docker_registry_enabled is true and -# docker_registry_enable_tls is false. -kolla_docker_registry_insecure: - # Username to use to access a docker registry. kolla_docker_registry_username: diff --git a/doc/source/configuration/reference/hosts.rst b/doc/source/configuration/reference/hosts.rst index b82f209d76b64c3ccb22e7da7ca0ced4a2e6b7ae..750d3af2f16d14e4814cb194c47109da74902fd3 100644 --- a/doc/source/configuration/reference/hosts.rst +++ b/doc/source/configuration/reference/hosts.rst @@ -1065,6 +1065,9 @@ Docker. Various options are defined in ``${KAYOBE_CONFIG_PATH}/docker.yml`` for configuring the ``devicemapper`` storage. +If using an insecure (HTTP) registry, set ``docker_registry_insecure`` to +``true``. + A private Docker registry may be configured via ``docker_registry``, with a Certificate Authority (CA) file configured via ``docker_registry_ca``. diff --git a/doc/source/configuration/reference/kolla-ansible.rst b/doc/source/configuration/reference/kolla-ansible.rst index 97f55c70e9c2cd3864c1ab80710bd43fdb25ea2b..120fea0640b85e901d6684917f6b8f6571718fee 100644 --- a/doc/source/configuration/reference/kolla-ansible.rst +++ b/doc/source/configuration/reference/kolla-ansible.rst @@ -121,10 +121,6 @@ accessed. ``kolla_docker_registry`` URL of docker registry to use for Kolla images. Default is not set, in 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 - ``docker_registry_enable_tls`` is false. ``kolla_docker_namespace`` Docker namespace to use for Kolla images. Default is ``kolla``. ``kolla_docker_registry_username`` diff --git a/etc/kayobe/docker.yml b/etc/kayobe/docker.yml index 4ec00a1f468728312cf37ec9bbcfd8b3503a4b05..ba3f22c9a86641432ff6192d8e12a45ecae5397c 100644 --- a/etc/kayobe/docker.yml +++ b/etc/kayobe/docker.yml @@ -24,6 +24,11 @@ # URL of docker registry #docker_registry: +# Whether docker should be configured to use an insecure registry. +# Default is false, unless docker_registry_enabled is true and +# docker_registry_enable_tls is false. +#docker_registry_insecure: + # CA of docker registry #docker_registry_ca: diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 19e54c809262d0e1a351c63df66059c7871ad112..97850acfab968703d9cf6594d6a54a86df7efb57 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -85,11 +85,6 @@ # Docker namespace to use for Kolla images. Default is 'kolla'. #kolla_docker_namespace: -# Whether docker should be configured to use an insecure registry for Kolla -# images. Default is false, unless docker_registry_enabled is true and -# docker_registry_enable_tls is false. -#kolla_docker_registry_insecure: - # Username to use to access a docker registry. Default is not set, in which # case the registry will be used without authentication. #kolla_docker_registry_username: diff --git a/releasenotes/notes/remove-kolla-docker-registry-insecure-9d92a2c7c8bdc99c.yaml b/releasenotes/notes/remove-kolla-docker-registry-insecure-9d92a2c7c8bdc99c.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7a2925d967ec0981be58d17d739fb0d44daa09fe --- /dev/null +++ b/releasenotes/notes/remove-kolla-docker-registry-insecure-9d92a2c7c8bdc99c.yaml @@ -0,0 +1,13 @@ +--- +fixes: + - | + Removes the ``kolla_docker_registry_insecure`` variable from + ``etc/kayobe/kolla.yml`` as it is not used since the 2023.1 (Antelope) + release. The replacement ``docker_registry_insecure`` variable has been + added to ``etc/kayobe/docker.yml``. +upgrade: + - | + Removes the ``kolla_docker_registry_insecure`` variable from + ``etc/kayobe/kolla.yml`` as it is not used since the 2023.1 (Antelope) + release. The replacement ``docker_registry_insecure`` variable has been + added to ``etc/kayobe/docker.yml``.