From 1dce99094b8a2803a9e7e005f95de29f576f7b1a Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 12 Oct 2023 09:52:35 +0100 Subject: [PATCH] Remove unsupported kolla_docker_registry_insecure variable This variable is not supported since I61a61ca59652b13687c2247d5881012b51f666a7, but was not removed from etc/kayobe/kolla.yml in that change. This change also adds the replacement variable docker_registry_insecure to etc/kayobe/docker.yml. TrivialFix Change-Id: I3fa96f0276e08a6678e5d743399d01bc19a8dd1b --- ansible/inventory/group_vars/all/docker | 5 +++++ ansible/inventory/group_vars/all/kolla | 5 ----- ansible/roles/kolla-ansible/defaults/main.yml | 5 ----- doc/source/configuration/reference/hosts.rst | 3 +++ .../configuration/reference/kolla-ansible.rst | 4 ---- etc/kayobe/docker.yml | 5 +++++ etc/kayobe/kolla.yml | 5 ----- ...a-docker-registry-insecure-9d92a2c7c8bdc99c.yaml | 13 +++++++++++++ 8 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 releasenotes/notes/remove-kolla-docker-registry-insecure-9d92a2c7c8bdc99c.yaml diff --git a/ansible/inventory/group_vars/all/docker b/ansible/inventory/group_vars/all/docker index 820ebbd5e..b9030abc4 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 df3d012bf..bdd8f3c7e 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 bf2b371e7..3d26fa0d3 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 b82f209d7..750d3af2f 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 97f55c70e..120fea064 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 4ec00a1f4..ba3f22c9a 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 19e54c809..97850acfa 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 000000000..7a2925d96 --- /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``.