Skip to content

Commit 491b56b

Browse files
committed
Container: T7473: Fix the smoketest and comment out the log-driver configuration in the template
1 parent a7878b5 commit 491b56b

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

data/templates/container/containers.conf.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,7 @@ default_sysctls = [
172172

173173
# Logging driver for the container. Available options: k8s-file and journald.
174174
#
175-
{% if log_driver is vyos_defined %}
176-
log_driver = "{{ log_driver }}"
177-
{% else %}
178175
#log_driver = "k8s-file"
179-
{% endif %}
180176

181177
# Maximum size allowed for the container log file. Negative numbers indicate
182178
# that no size limit is imposed. If positive, it must be >= 8192 to match or

smoketest/scripts/cli/test_container.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def test_basic(self):
110110
tmp = cmd(f'sudo podman exec -it {cont_name} sysctl kernel.msgmax')
111111
self.assertEqual(tmp, 'kernel.msgmax = 4096')
112112

113-
tmp = cmd(f'podman container inspect {cont_name} --format "{{ .HostConfig.LogConfig.Type }}"')
113+
tmp = cmd(f'podman container inspect {cont_name} --format "{{{{ .HostConfig.LogConfig.Type }}}}""')
114114
self.assertEqual(tmp, 'journald')
115115

116116

0 commit comments

Comments
 (0)