Merge pull request #4172 from ashcrow/1450307

Merged by openshift-bot

roles/docker/tasks/systemcontainer_docker.yml

@@ -27,7 +27,7 @@
     state: present
   when: not openshift.common.is_atomic | bool
 
-# If we are on atomic, set http_proxy and https_proxy in /etc/atomic.conf
+# Set http_proxy and https_proxy in /etc/atomic.conf
 - block:
 
     - name: Add http_proxy to /etc/atomic.conf
@@ -46,9 +46,6 @@
         - openshift.common.https_proxy is defined
         - openshift.common.https_proxy != ''
 
-  when: openshift.common.is_atomic | bool
-
-
 - block:
 
     - name: Set to default prepend
@@ -93,7 +90,7 @@
 
 - name: Ensure docker.service.d directory exists
   file:
-    path: "{{ docker_systemd_dir }}"
+    path: "{{ container_engine_systemd_dir }}"
     state: directory
 
 - name: Ensure /etc/docker directory exists
@@ -111,7 +108,7 @@
 
 - name: Configure Container Engine Service File
   template:
-    dest: "{{ docker_systemd_dir }}/custom.conf"
+    dest: "{{ container_engine_systemd_dir }}/custom.conf"
     src: systemcontainercustom.conf.j2
 
 # Set local versions of facts that must be in json format for daemon.json

roles/docker/templates/systemcontainercustom.conf.j2

@@ -1,15 +1,15 @@
 # {{ ansible_managed }}
 
 [Service]
-{%- if "http_proxy" in openshift.common %}
+{% if "http_proxy" in openshift.common %}
 ENVIRONMENT=HTTP_PROXY={{ docker_http_proxy }}
-{%- endif -%}
-{%- if "https_proxy" in openshift.common %}
+{% endif -%}
+{% if "https_proxy" in openshift.common %}
 ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }}
-{%- endif -%}
-{%- if "no_proxy" in openshift.common %}
+{% endif -%}
+{% if "no_proxy" in openshift.common %}
 ENVIRONMENT=NO_PROXY={{ docker_no_proxy }}
-{%- endif %}
+{% endif %}
 {%- if os_firewall_use_firewalld|default(false) %}
 [Unit]
 Wants=iptables.service

roles/docker/vars/main.yml

@@ -1,4 +1,5 @@
 ---
 docker_systemd_dir: /etc/systemd/system/docker.service.d
+container_engine_systemd_dir: /etc/systemd/system/container-engine.service.d
 docker_conf_dir: /etc/docker/
 udevw_udevd_dir: /etc/systemd/system/systemd-udevd.service.d