diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-05 12:40:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-05 12:40:33 -0500 |
| commit | bc5eb65f9bcd4147130e062ef2e4499145811c90 (patch) | |
| tree | 77c84ff9cfde394a06188b6728f54da9c1ed6658 /roles/docker/templates | |
| parent | 37d759f17a772b9ddf1e6b49c023dca6fc79d801 (diff) | |
| parent | e360372dcaf78648a329ce16f9d0365eed6636c8 (diff) | |
| download | openshift-bc5eb65f9bcd4147130e062ef2e4499145811c90.tar.gz openshift-bc5eb65f9bcd4147130e062ef2e4499145811c90.tar.bz2 openshift-bc5eb65f9bcd4147130e062ef2e4499145811c90.tar.xz openshift-bc5eb65f9bcd4147130e062ef2e4499145811c90.zip | |
Merge pull request #4103 from ganhuang/fix_container_engine
Merged by openshift-bot
Diffstat (limited to 'roles/docker/templates')
| -rw-r--r-- | roles/docker/templates/daemon.json | 4 | ||||
| -rw-r--r-- | roles/docker/templates/systemcontainercustom.conf.j2 | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json index bd085d2be..30a1b30f4 100644 --- a/roles/docker/templates/daemon.json +++ b/roles/docker/templates/daemon.json @@ -34,7 +34,9 @@ "ip-masq": false, "labels": [], "live-restore": true, +{% if docker_log_driver is defined %} "log-driver": "{{ docker_log_driver }}", +{% endif %} "log-level": "", "log-opts": {{ docker_log_options|default({}) }}, "max-concurrent-downloads": 3, @@ -59,6 +61,6 @@ "tlsverify": true, "userns-remap": "", "add-registry": {{ docker_additional_registries|default([]) }}, - "blocked-registries": {{ docker_blocked_registries|defaukt([]) }}, + "blocked-registries": {{ docker_blocked_registries|default([]) }}, "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current" } diff --git a/roles/docker/templates/systemcontainercustom.conf.j2 b/roles/docker/templates/systemcontainercustom.conf.j2 index a2cfed8a9..a4fb01d2b 100644 --- a/roles/docker/templates/systemcontainercustom.conf.j2 +++ b/roles/docker/templates/systemcontainercustom.conf.j2 @@ -1,13 +1,13 @@ # {{ ansible_managed }} [Service] -{%- if docker_http_proxy %} +{%- if "http_proxy" in openshift.common %} ENVIRONMENT=HTTP_PROXY={{ docker_http_proxy }} {%- endif -%} -{%- if docker_https_proxy %} +{%- if "https_proxy" in openshift.common %} ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }} {%- endif -%} -{%- if docker_no_proxy %} +{%- if "no_proxy" in openshift.common %} ENVIRONMENT=NO_PROXY={{ docker_no_proxy }} {%- endif %} {%- if os_firewall_use_firewalld|default(true) %} |