diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 836e40107..aa6ac5426 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -123,3 +123,8 @@ dns_server: "{{ kube_service_addresses|ipaddr('net')|ipaddr(2)|ipaddr('address') # server master2 10.99.0.27:443 # balance roundrobin # apiserver_loadbalancer_domain_name: "lb-apiserver.kubernetes.local" + +##Set these proxy values in order to update docker daemon to use proxies +#http_proxy: "" +#https_proxy: "" +#no_proxy: "" diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml new file mode 100644 index 000000000..4153d123d --- /dev/null +++ b/roles/docker/handlers/main.yml @@ -0,0 +1,15 @@ +--- +- name: restart docker + command: /bin/true + notify: + - reload systemd + - reload docker + +- name : reload systemd + shell: systemctl daemon-reload + when: ansible_service_mgr == "systemd" + +- name: reload docker + service: + name: docker + state: restarted diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 47e5d24a1..c15d148c8 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -53,6 +53,11 @@ with_items: "{{ docker_package_info.pkgs }}" when: docker_package_info.pkgs|length > 0 +- name: allow for proxies on systems using systemd + include: systemd-proxies.yml + when: ansible_service_mgr == "systemd" and + (http_proxy is defined or https_proxy is defined or no_proxy is defined) + - meta: flush_handlers - name: ensure docker service is started and enabled diff --git a/roles/docker/tasks/systemd-proxies.yml b/roles/docker/tasks/systemd-proxies.yml new file mode 100644 index 000000000..4bbc423c9 --- /dev/null +++ b/roles/docker/tasks/systemd-proxies.yml @@ -0,0 +1,9 @@ +--- +- name: create docker service directory for systemd + file: path=/etc/systemd/system/docker.service.d state=directory + +- name: drop docker environment conf to enable proxy usage + template: + src: http-proxy.conf.j2 + dest: /etc/systemd/system/docker.service.d/http-proxy.conf + notify: restart docker diff --git a/roles/docker/templates/http-proxy.conf.j2 b/roles/docker/templates/http-proxy.conf.j2 new file mode 100644 index 000000000..7e558837c --- /dev/null +++ b/roles/docker/templates/http-proxy.conf.j2 @@ -0,0 +1,3 @@ +[Service] + +Environment={% if http_proxy %}"HTTP_PROXY={{ http_proxy }}"{% endif %} {% if https_proxy %}"HTTPS_PROXY={{ https_proxy }}"{% endif %} {% if no_proxy %}"NO_PROXY={{ no_proxy }}"{% endif %}