summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2016-11-14 09:33:19 -0500
committerRussell Teague <rteague@redhat.com>2016-11-14 09:33:19 -0500
commite93c069079c1c88475fe54691fc530b6a1be6196 (patch)
treedd98854c3e594d831f169bafba6cb0a050f4402e /roles/docker
parentb29e9340544cbfb127e0a7f6be88f8b4f2818b4d (diff)
downloadopenshift-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')
-rw-r--r--roles/docker/README.md2
-rw-r--r--roles/docker/meta/main.yml4
-rw-r--r--roles/docker/tasks/main.yml3
3 files changed, 4 insertions, 5 deletions
diff --git a/roles/docker/README.md b/roles/docker/README.md
index 6b5ee4421..1f0d94da0 100644
--- a/roles/docker/README.md
+++ b/roles/docker/README.md
@@ -17,7 +17,7 @@ docker_udev_workaround: raises udevd timeout to 5 minutes (https://bugzilla.redh
Dependencies
------------
-None
+Depends on the os_firewall role.
Example Playbook
----------------
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
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 240673b22..306c649c5 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,7 +1,4 @@
---
-- stat: path=/etc/sysconfig/docker-storage
- register: docker_storage_check
-
- name: Get current installed Docker version
command: "{{ repoquery_cmd }} --installed --qf '%{version}' docker"
when: not openshift.common.is_atomic | bool