From a0ff355bb2dfeac70a5e69ac4eae02be6575d40e Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Mon, 29 Jan 2024 17:45:54 +0000 Subject: [PATCH] Fix: include missing docker log-opts in config The default docker config options, which specify the ``log-opts`` under ``roles/docker/vars/main.yml``, were not included in the ``docker_config`` combinations when the docker role was extracted from the baremetal role in the Zed release. This means that ``docker_log_max_file`` and ``docker_log_max_size`` are not written into the docker daemon.json. The var name needs to be changed, as it can't be recursively defined within the ``docker_config`` definition under ``roles/docker/tasks/config.yml`. Closes-Bug: #2040105 Change-Id: I05efda2a9699336136dce8cfa99ada77b9b2a17b (cherry picked from commit cff2a29d1c21a1d05ce97ebf1d41f846189f1547) --- .../fix-include-docker-log-opts-15607fb5a4ad3ed5.yaml | 7 +++++++ roles/docker/tasks/config.yml | 2 +- roles/docker/vars/main.yml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/fix-include-docker-log-opts-15607fb5a4ad3ed5.yaml diff --git a/releasenotes/notes/fix-include-docker-log-opts-15607fb5a4ad3ed5.yaml b/releasenotes/notes/fix-include-docker-log-opts-15607fb5a4ad3ed5.yaml new file mode 100644 index 0000000..2daca0d --- /dev/null +++ b/releasenotes/notes/fix-include-docker-log-opts-15607fb5a4ad3ed5.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Docker log-opts are now included in the docker daemon.json config again. + This allows for ``docker_log_max_file`` and ``docker_log_max_size`` to now + be set/overidden correctly. + `LP#2044537 `__ diff --git a/roles/docker/tasks/config.yml b/roles/docker/tasks/config.yml index 2fba292..0bbe658 100644 --- a/roles/docker/tasks/config.yml +++ b/roles/docker/tasks/config.yml @@ -33,7 +33,7 @@ docker_config_debug: debug: "{{ docker_debug }}" docker_config: >- - {{ {} + {{ default_docker_config | combine(docker_zun_config if docker_configure_for_zun | bool and 'zun-compute' in group_names else {}) | combine(docker_config_insecure_registries if docker_registry_insecure | bool else {}) | combine(docker_config_registry_mirror if docker_registry_mirrors | length > 0 else {}) diff --git a/roles/docker/vars/main.yml b/roles/docker/vars/main.yml index cafc448..2ab0e54 100644 --- a/roles/docker/vars/main.yml +++ b/roles/docker/vars/main.yml @@ -1,5 +1,5 @@ --- -docker_config: +default_docker_config: log-opts: max-file: "{{ docker_log_max_file }}" max-size: "{{ docker_log_max_size }}"