summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-09 12:49:04 -0500
committerGitHub <noreply@github.com>2017-01-09 12:49:04 -0500
commiteb451532df15b010bd9d26195b93096a8bd20148 (patch)
treeceecd7342c71717830a3a928022196545f08e420 /roles/docker/tasks
parent96fe76dad188610733c87cf80f4e22da34f11fb7 (diff)
parent05e189a039dada5edc4f9afb700b594c4dea4c9b (diff)
downloadopenshift-eb451532df15b010bd9d26195b93096a8bd20148.tar.gz
openshift-eb451532df15b010bd9d26195b93096a8bd20148.tar.bz2
openshift-eb451532df15b010bd9d26195b93096a8bd20148.tar.xz
openshift-eb451532df15b010bd9d26195b93096a8bd20148.zip
Merge pull request #2909 from mtnbikenc/firewalld
Enable firewalld by default
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/main.yml22
1 files changed, 12 insertions, 10 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index a93bdc2ad..57da23e0a 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -43,16 +43,18 @@
package: name=docker{{ '-' + docker_version if docker_version is defined else '' }} state=present
when: not openshift.common.is_atomic | bool
-- name: Ensure docker.service.d directory exists
- file:
- path: "{{ docker_systemd_dir }}"
- state: directory
-
-# Extend the default Docker service unit file
-- name: Configure Docker service unit file
- template:
- dest: "{{ docker_systemd_dir }}/custom.conf"
- src: custom.conf.j2
+- block:
+ # Extend the default Docker service unit file when using iptables-services
+ - name: Ensure docker.service.d directory exists
+ file:
+ path: "{{ docker_systemd_dir }}"
+ state: directory
+
+ - name: Configure Docker service unit file
+ template:
+ dest: "{{ docker_systemd_dir }}/custom.conf"
+ src: custom.conf.j2
+ when: not os_firewall_use_firewalld | default(True) | bool
- include: udev_workaround.yml
when: docker_udev_workaround | default(False) | bool