diff options
| author | Joel Diaz <jdiaz@redhat.com> | 2015-12-04 13:08:09 -0500 |
|---|---|---|
| committer | Joel Diaz <jdiaz@redhat.com> | 2015-12-04 13:08:09 -0500 |
| commit | f62ff6103d1e21cc2e19a501c785f8ef00584e20 (patch) | |
| tree | 873de6df71461f9520efcfdca543f2adbc50d985 /roles/docker/tasks | |
| parent | 24fdc577aada7916cdd3d22d2d3b2b22af6560e0 (diff) | |
| parent | c62cbeedcf19a52aa4165f9e798ab8922f1a4803 (diff) | |
| download | openshift-f62ff6103d1e21cc2e19a501c785f8ef00584e20.tar.gz openshift-f62ff6103d1e21cc2e19a501c785f8ef00584e20.tar.bz2 openshift-f62ff6103d1e21cc2e19a501c785f8ef00584e20.tar.xz openshift-f62ff6103d1e21cc2e19a501c785f8ef00584e20.zip | |
Merge pull request #1016 from joelddiaz/move-docker-timeout-workaround
bring the docker udev workaround into openshift-ansible.git
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/docker/tasks/udev_workaround.yml | 30 |
2 files changed, 32 insertions, 0 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index dd4401389..857674454 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -11,3 +11,5 @@ - name: enable and start the docker service service: name=docker enabled=yes state=started +- include: udev_workaround.yml + when: docker_udev_workaround | default(False) diff --git a/roles/docker/tasks/udev_workaround.yml b/roles/docker/tasks/udev_workaround.yml new file mode 100644 index 000000000..3c236f698 --- /dev/null +++ b/roles/docker/tasks/udev_workaround.yml @@ -0,0 +1,30 @@ +--- + +- name: Getting current systemd-udevd exec command + command: grep -e "^ExecStart=" /lib/systemd/system/systemd-udevd.service + changed_when: false + register: udevw_udev_start_cmd + +- name: Assure systemd-udevd.service.d directory exists + file: + path: "{{ udevw_udevd_dir }}" + state: directory + +- name: Create systemd-udevd override file + copy: + content: | + [Service] + #Need blank ExecStart to "clear" pre-exising one + ExecStart= + {{ udevw_udev_start_cmd.stdout }} --event-timeout=300 + dest: "{{ udevw_udevd_dir }}/override.conf" + owner: root + mode: "0644" + notify: + - restart udev + register: udevw_override_conf + +- name: reload systemd config files + command: systemctl daemon-reload + when: udevw_override_conf | changed + |