diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-09 14:51:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 14:51:12 -0500 |
| commit | 5d408eeca04cb3c60a7e4918218e87fd43e57861 (patch) | |
| tree | 64f12e11375a9085dd6238fa7723e0523215855e /roles/docker/tasks | |
| parent | 0db3ca9c7974b3a6ddfb82a14513d7250e029d3f (diff) | |
| parent | bdf66ab41f8b19f0cbefb95fabc277f3bbd04716 (diff) | |
| download | openshift-5d408eeca04cb3c60a7e4918218e87fd43e57861.tar.gz openshift-5d408eeca04cb3c60a7e4918218e87fd43e57861.tar.bz2 openshift-5d408eeca04cb3c60a7e4918218e87fd43e57861.tar.xz openshift-5d408eeca04cb3c60a7e4918218e87fd43e57861.zip | |
Merge pull request #4106 from ashcrow/1448384
Merged by openshift-bot
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index b0d0632b0..722232a9b 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -114,6 +114,14 @@ dest: "{{ docker_systemd_dir }}/custom.conf" src: systemcontainercustom.conf.j2 +# Set local versions of facts that must be in json format for daemon.json +# NOTE: When jinja2.9+ is used the daemon.json file can move to using tojson +- set_fact: + l_docker_insecure_registries: "{{ docker_insecure_registries | default([]) | to_json }}" + l_docker_log_options: "{{ docker_log_options | default({}) | to_json }}" + l_docker_additional_registries: "{{ docker_additional_registries | default([]) | to_json }}" + l_docker_blocked_registries: "{{ docker_blocked_registries | default([]) | to_json }}" + # Configure container-engine using the daemon.json file - name: Configure Container Engine template: |