From e93c069079c1c88475fe54691fc530b6a1be6196 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Mon, 14 Nov 2016 09:33:19 -0500
Subject: Added dependency of os_firewall to docker role

The docker role requires iptables-services to be installed. Added
dependency on so_firewall role to ensure the iptables service is
installed first. Currently this will only work with iptables and
not with firewalld.

* Added allow_duplicates to os_firewall role meta
* Removed unused task from docker/tasks
* Corrected os_firewall Defaults in README
---
 roles/os_firewall/meta/main.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'roles/os_firewall/meta')

diff --git a/roles/os_firewall/meta/main.yml b/roles/os_firewall/meta/main.yml
index c93335b7b..6df7c9f2b 100644
--- a/roles/os_firewall/meta/main.yml
+++ b/roles/os_firewall/meta/main.yml
@@ -11,5 +11,6 @@ galaxy_info:
     - 7
   categories:
   - system
+allow_duplicates: yes
 dependencies:
 - { role: openshift_facts }
-- 
cgit v1.2.3