From c90c981bb28001fe7e47b5ef9c2732c4db1e998f Mon Sep 17 00:00:00 2001
From: Spencer Smith <robertspencersmith@gmail.com>
Date: Thu, 12 May 2016 09:03:11 -0700
Subject: [PATCH] updated to support all OSes using systemd
---
roles/docker/tasks/main.yml | 5 ++---
roles/docker/tasks/{rhel-proxies.yml => systemd-proxies.yml} | 0
2 files changed, 2 insertions(+), 3 deletions(-)
rename roles/docker/tasks/{rhel-proxies.yml => systemd-proxies.yml} (100%)
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 9201f56ec..18154cb34 100644
--- 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
diff --git a/roles/docker/tasks/rhel-proxies.yml b/roles/docker/tasks/systemd-proxies.yml
similarity index 100%
rename from roles/docker/tasks/rhel-proxies.yml
rename to roles/docker/tasks/systemd-proxies.yml
--
GitLab