diff options
| author | Russell Teague <rteague@redhat.com> | 2016-11-11 10:41:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 10:41:12 -0500 |
| commit | b29e9340544cbfb127e0a7f6be88f8b4f2818b4d (patch) | |
| tree | 46a8a8764417dbd5992476104e8ccf23ab1f7b7f | |
| parent | 9bf23fd0aafdfb13f4a444e2c1437d407421f50c (diff) | |
| parent | b300b2e3563f406058b6c29d61a9ec7fb6969cab (diff) | |
| download | openshift-b29e9340544cbfb127e0a7f6be88f8b4f2818b4d.tar.gz openshift-b29e9340544cbfb127e0a7f6be88f8b4f2818b4d.tar.bz2 openshift-b29e9340544cbfb127e0a7f6be88f8b4f2818b4d.tar.xz openshift-b29e9340544cbfb127e0a7f6be88f8b4f2818b4d.zip | |
Merge pull request #2770 from mtnbikenc/docker-fix
Resolve docker and iptables service dependencies
| -rw-r--r-- | roles/docker/tasks/main.yml | 14 | ||||
| -rw-r--r-- | roles/docker/templates/custom.conf.j2 | 5 | ||||
| -rw-r--r-- | roles/docker/vars/main.yml | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 7147aa2d4..240673b22 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -46,11 +46,23 @@ action: "{{ ansible_pkg_mgr }} 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 + - name: Start the Docker service - service: + systemd: name: docker enabled: yes state: started + daemon_reload: yes register: start_result - set_fact: diff --git a/roles/docker/templates/custom.conf.j2 b/roles/docker/templates/custom.conf.j2 new file mode 100644 index 000000000..53ed56abc --- /dev/null +++ b/roles/docker/templates/custom.conf.j2 @@ -0,0 +1,5 @@ +# {{ ansible_managed }} + +[Unit] +Requires=iptables.service +After=iptables.service diff --git a/roles/docker/vars/main.yml b/roles/docker/vars/main.yml index f81f99e2b..5237ed8f2 100644 --- a/roles/docker/vars/main.yml +++ b/roles/docker/vars/main.yml @@ -1,2 +1,3 @@ --- udevw_udevd_dir: /etc/systemd/system/systemd-udevd.service.d +docker_systemd_dir: /etc/systemd/system/docker.service.d |