Merge "Remove unsupported kolla_docker_registry_insecure variable"

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:
 

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:
 

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:
 

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``.
 

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``

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:
 

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:

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``.