diff options
| author | Russell Teague <rteague@redhat.com> | 2016-11-14 09:33:19 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2016-11-14 09:33:19 -0500 |
| commit | e93c069079c1c88475fe54691fc530b6a1be6196 (patch) | |
| tree | dd98854c3e594d831f169bafba6cb0a050f4402e /roles/docker/meta | |
| parent | b29e9340544cbfb127e0a7f6be88f8b4f2818b4d (diff) | |
| download | openshift-e93c069079c1c88475fe54691fc530b6a1be6196.tar.gz openshift-e93c069079c1c88475fe54691fc530b6a1be6196.tar.bz2 openshift-e93c069079c1c88475fe54691fc530b6a1be6196.tar.xz openshift-e93c069079c1c88475fe54691fc530b6a1be6196.zip | |
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
Diffstat (limited to 'roles/docker/meta')
| -rw-r--r-- | roles/docker/meta/main.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/docker/meta/main.yml b/roles/docker/meta/main.yml index 6e2c98601..3d362158d 100644 --- a/roles/docker/meta/main.yml +++ b/roles/docker/meta/main.yml @@ -9,4 +9,6 @@ galaxy_info: - name: EL versions: - 7 -dependencies: [] +dependencies: + - role: os_firewall + os_firewall_use_firewalld: False |