Merge "Fix: include missing docker log-opts in config"

jovial · Feb 19, 2024 · dbb7d9c · dbb7d9c
2 parents 7063f52 + cff2a29
commit dbb7d9c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/releasenotes/notes/fix-include-docker-log-opts-15607fb5a4ad3ed5.yaml 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 <https://launchpad.net/bugs/2040105>`__
diff --git 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
@@ -1,5 +1,5 @@
 ---
-docker_config:
+default_docker_config:
   log-opts:
     max-file: "{{ docker_log_max_file }}"
     max-size: "{{ docker_log_max_size }}"