diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-12-20 07:21:21 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-12-20 15:40:10 +0000 |
| commit | 85e64326304c72bfcaf41ddd03ddd47edddc29fe (patch) | |
| tree | e8ca0b3f131b44031f4ba89e3172a4a224bc57a8 /tests | |
| parent | 2cc21b0e6334364fd117486f7d79d21094570920 (diff) | |
| download | kolla-ansible-85e64326304c72bfcaf41ddd03ddd47edddc29fe.tar.gz kolla-ansible-85e64326304c72bfcaf41ddd03ddd47edddc29fe.zip | |
CI: Rework docker config vars
Change-Id: I552fea9f9b461e57611f1d2aa5c767a1f4043ff8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/get_logs.sh | 2 | ||||
| -rw-r--r-- | tests/templates/globals-default.j2 | 25 |
2 files changed, 18 insertions, 9 deletions
diff --git a/tests/get_logs.sh b/tests/get_logs.sh index 13253d8d7..e3dc1b7be 100644 --- a/tests/get_logs.sh +++ b/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 diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 248e8f5a0..1d469fa65 100644 --- a/tests/templates/globals-default.j2 +++ b/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_registry_insecure: "yes" +podman_debug: true +podman_registry_mirrors: + - {{ infra_dockerhub_mirror }} podman_sdk_pip_packages: - "podman>=4.7.0" - rich +{% if need_build_image and is_previous_release %} +podman_registry: "primary:4000" +podman_registry_insecure: true {% endif %} -docker_restart_policy: "no" -docker_custom_config: - debug: true - registry-mirrors: - - {{ infra_dockerhub_mirror }} +{% else %} +docker_debug: true +docker_registry_mirrors: + - {{ infra_dockerhub_mirror }} {% if need_build_image and is_previous_release %} - insecure-registries: - - primary:4000 +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 }}" |