Merge "CI: Rework docker config vars"

tests/get_logs.sh

@@ -25,6 +25,8 @@ copy_logs() {
     # copy docker configs if used
     if [ "$CONTAINER_ENGINE" = "docker" ]; then
         cp -rL /etc/docker/ ${LOG_DIR}/system_configs/
+    elif [ "$CONTAINER_ENGINE" = "podman" ]; then
+        cp -rL /etc/containers/ ${LOG_DIR}/system_configs/
     fi
     # Remove /var/log/kolla link to not double the data uploaded
     unlink /var/log/kolla

tests/templates/globals-default.j2

@@ -13,25 +13,32 @@ kolla_base_distro: "{{ base_distro }}"
 network_interface: "{{ api_interface_name }}"
 network_address_family: "{{ address_family }}"
 kolla_container_engine: "{{ container_engine }}"
+docker_restart_policy: "no"
+
 {% if container_engine == 'podman' %}
-podman_registry: "primary:4000"
+podman_debug: true
-podman_registry_insecure: "yes"
+podman_registry_mirrors:
+  - {{ infra_dockerhub_mirror }}
 podman_sdk_pip_packages:
   - "podman>=4.7.0"
   - rich
-{% endif %}
-docker_restart_policy: "no"
-docker_custom_config:
-  debug: true
-  registry-mirrors:
-    - {{ infra_dockerhub_mirror }}
 {% if need_build_image and is_previous_release %}
-  insecure-registries:
+podman_registry: "primary:4000"
-    - primary:4000
+podman_registry_insecure: true
+{% endif %}
+{% else %}
+docker_debug: true
+docker_registry_mirrors:
+  - {{ infra_dockerhub_mirror }}
+{% if need_build_image and is_previous_release %}
+docker_registry: "primary:4000"
+docker_registry_insecure: true
 {% endif %}
 {% if ansible_facts.distribution == "openEuler" %}
+docker_custom_config:
   exec-opts: ["native.umask=normal"]
 {% endif %}
+{% endif %}
 
 {% if kolla_python_version is defined and not is_previous_release %}
 distro_python_version: "{{ kolla_python_version }}"