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
This commit is contained in:
parent
8a432a13ba
commit
cff2a29d1c
@ -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>`__
|
@ -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 {})
|
||||
|
@ -1,5 +1,5 @@
|
||||
---
|
||||
docker_config:
|
||||
default_docker_config:
|
||||
log-opts:
|
||||
max-file: "{{ docker_log_max_file }}"
|
||||
max-size: "{{ docker_log_max_size }}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user