diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-08 12:52:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 12:52:04 -0500 |
| commit | 8b484281b6052b82869da8cc691e427ec9e1a0fc (patch) | |
| tree | f8d9a77d4a22caf1567b5b83cdbd83c5affd36fa /roles/container_runtime/templates | |
| parent | 0beab180d22f28f3f529ca0252f23bb92a7b69a7 (diff) | |
| parent | 40d63b7dfa8b88ad2459a86b436385612dbb2150 (diff) | |
| download | openshift-8b484281b6052b82869da8cc691e427ec9e1a0fc.tar.gz openshift-8b484281b6052b82869da8cc691e427ec9e1a0fc.tar.bz2 openshift-8b484281b6052b82869da8cc691e427ec9e1a0fc.tar.xz openshift-8b484281b6052b82869da8cc691e427ec9e1a0fc.zip | |
Merge pull request #6316 from giuseppe/fix-syscontainers-installation
syscontainers: fix CRI-O and container-engine installation
Diffstat (limited to 'roles/container_runtime/templates')
| -rw-r--r-- | roles/container_runtime/templates/daemon.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/container_runtime/templates/daemon.json b/roles/container_runtime/templates/daemon.json index 383963bd3..1a72d812a 100644 --- a/roles/container_runtime/templates/daemon.json +++ b/roles/container_runtime/templates/daemon.json @@ -5,10 +5,10 @@ "disable-legacy-registry": false, "exec-opts": ["native.cgroupdriver=systemd"], "insecure-registries": {{ l_docker_insecure_registries }}, -{% if openshift_docker_log_driver is defined %} +{% if openshift_docker_log_driver %} "log-driver": "{{ openshift_docker_log_driver }}", {%- endif %} - "log-opts": {{ l_docker_log_options }}, + "log-opts": {{ l_docker_log_options_dict }}, "runtimes": { "oci": { "path": "/usr/libexec/docker/docker-runc-current" |