diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-12-19 13:08:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-19 13:08:55 -0500 |
commit | 151115eaf18d557aa8f770e61820e10bed4109bc (patch) | |
tree | 2d8a7305669b242ec1c03a06ecb5cf3238dec688 /roles/container_runtime/defaults | |
parent | 7ab8e67bfc62e16466e3fd211fded63f16583403 (diff) | |
parent | 801779eeb6f6308f81ae7c48409de7686c04a0aa (diff) | |
download | openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.gz openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.bz2 openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.xz openshift-151115eaf18d557aa8f770e61820e10bed4109bc.zip |
Merge pull request #6469 from mgugino-upstream-stage/plugin-consolidate
Plugin consolidate
Diffstat (limited to 'roles/container_runtime/defaults')
-rw-r--r-- | roles/container_runtime/defaults/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml index dd185cb38..6ab0456bc 100644 --- a/roles/container_runtime/defaults/main.yml +++ b/roles/container_runtime/defaults/main.yml @@ -59,7 +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_log_options_dict: "{{ l2_docker_log_options | lib_utils_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 }}" |