diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-06 10:17:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-06 10:17:13 -0700 |
| commit | 707be43d8ed091612ae1cf7e0f44a3b5598d402a (patch) | |
| tree | 4ddd3aa96a778851a4e58c49101e5958b8373224 | |
| parent | e7e82bede0f7ebac08a4290a3f088cca0ea3ab78 (diff) | |
| parent | 3d0ffb6edbd42d8b663bb268374101f44b6d2e36 (diff) | |
| download | openshift-707be43d8ed091612ae1cf7e0f44a3b5598d402a.tar.gz openshift-707be43d8ed091612ae1cf7e0f44a3b5598d402a.tar.bz2 openshift-707be43d8ed091612ae1cf7e0f44a3b5598d402a.tar.xz openshift-707be43d8ed091612ae1cf7e0f44a3b5598d402a.zip | |
Merge pull request #5680 from mgugino-upstream-stage/ensure-docker-restarts-with-iptables
Automatic merge from submit-queue.
Ensure docker is restarted when iptables is restarted
Currently, os_firewall role may run after docker role,
and iptables.service may be restarted. When restarted,
this negatively impacts docker's iptables rules.
This commit ensures that if iptables is restarted,
docker is restarted as well (by systemd)
Fixes: https://github.com/openshift/origin/issues/16709
| -rw-r--r-- | roles/docker/handlers/main.yml | 1 | ||||
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml index 591367467..866ed0452 100644 --- a/roles/docker/handlers/main.yml +++ b/roles/docker/handlers/main.yml @@ -4,6 +4,7 @@ systemd: name: "{{ openshift.docker.service_name }}" state: restarted + daemon_reload: yes register: r_docker_restart_docker_result until: not r_docker_restart_docker_result | failed retries: 3 diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index eab5c3bb1..dbe0b0d28 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -48,7 +48,9 @@ template: dest: "{{ docker_systemd_dir }}/custom.conf" src: custom.conf.j2 - when: not os_firewall_use_firewalld | default(False) | bool + notify: + - restart docker + when: not (os_firewall_use_firewalld | default(False)) | bool - name: Add enterprise registry, if necessary set_fact: |