diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-12-06 13:52:42 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-12-08 18:41:12 +0100 |
| commit | 9c29b47f788b588d6f126a73e4eb03839cfb848f (patch) | |
| tree | 65e581f97d5a8d481606f4cb42e591d2160cd16d | |
| parent | 7d7c4f3056fd3456f5e00f75da2154300f7e96ee (diff) | |
| download | openshift-9c29b47f788b588d6f126a73e4eb03839cfb848f.tar.gz openshift-9c29b47f788b588d6f126a73e4eb03839cfb848f.tar.bz2 openshift-9c29b47f788b588d6f126a73e4eb03839cfb848f.tar.xz openshift-9c29b47f788b588d6f126a73e4eb03839cfb848f.zip | |
container-engine: log-opts is a dictionary in the daemon.json file
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | filter_plugins/oo_filters.py | 8 | ||||
| -rw-r--r-- | roles/container_runtime/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/container_runtime/templates/daemon.json | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 2cb30123e..3eaf2aed5 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -375,6 +375,13 @@ def oo_split(string, separator=','): return string.split(separator) +def oo_list_to_dict(lst, separator='='): + """ This converts a list of ["k=v"] to a dictionary {k: v}. + """ + kvs = [i.split(separator) for i in lst] + return {k: v for k, v in kvs} + + def oo_haproxy_backend_masters(hosts, port): """ This takes an array of dicts and returns an array of dicts to be used as a backend for the haproxy role @@ -969,6 +976,7 @@ class FilterModule(object): "oo_combine_dict": oo_combine_dict, "oo_dict_to_list_of_dict": oo_dict_to_list_of_dict, "oo_split": oo_split, + "oo_list_to_dict": oo_list_to_dict, "oo_filter_list": oo_filter_list, "oo_parse_heat_stack_outputs": oo_parse_heat_stack_outputs, "oo_parse_named_certificates": oo_parse_named_certificates, diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml index c5a21ba46..d7eb8663f 100644 --- a/roles/container_runtime/defaults/main.yml +++ b/roles/container_runtime/defaults/main.yml @@ -59,6 +59,7 @@ docker_default_storage_path: /var/lib/docker # Set local versions of facts that must be in json format for container-daemon.json # NOTE: When jinja2.9+ is used the container-daemon.json file can move to using tojson l_docker_log_options: "{{ l2_docker_log_options | to_json }}" +l_docker_log_options_dict: "{{ l2_docker_log_options | oo_list_to_dict | to_json }}" l_docker_additional_registries: "{{ l2_docker_additional_registries | to_json }}" l_docker_blocked_registries: "{{ l2_docker_blocked_registries | to_json }}" l_docker_insecure_registries: "{{ l2_docker_insecure_registries | to_json }}" diff --git a/roles/container_runtime/templates/daemon.json b/roles/container_runtime/templates/daemon.json index 383963bd3..7c35d3080 100644 --- a/roles/container_runtime/templates/daemon.json +++ b/roles/container_runtime/templates/daemon.json @@ -8,7 +8,7 @@ {% if openshift_docker_log_driver is defined %} "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" |