updated to support all OSes using systemd

2016-05-12 09:03:11 -07:00 · 2016-05-12 09:03:11 -07:00 · c90c981bb2
commit c90c981bb2
parent ebf8231c9a
2 changed files with 2 additions and 3 deletions
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@ -54,9 +54,8 @@
  when: docker_package_info.pkgs|length > 0

 - name: allow for proxies on RHEL systems
-  include: rhel-proxies.yml
-  when: ansible_distribution in ["CentOS","RedHat"] and
-        ansible_distribution_major_version >= 7 and
+  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
--- a/roles/docker/tasks/systemd-proxies.yml
+++ b/roles/docker/tasks/systemd-proxies.yml