diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-03 16:06:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 16:06:16 -0500 |
| commit | 01135c08c46c3674f93123833bc14ba4aa661fe0 (patch) | |
| tree | 6033f586a27e4b7778bd52540768203bdde7ab1d /roles/docker/README.md | |
| parent | 850bb25200db1488f66c15d9a49cfb8dbc09946a (diff) | |
| parent | 44115530148069e200e3a5d92b00e981aaa6e824 (diff) | |
| download | openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.gz openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.bz2 openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.xz openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.zip | |
Merge pull request #4049 from ashcrow/system-container-docker
Merged by openshift-bot
Diffstat (limited to 'roles/docker/README.md')
| -rw-r--r-- | roles/docker/README.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/docker/README.md b/roles/docker/README.md index ea06fd41a..f25ca03cd 100644 --- a/roles/docker/README.md +++ b/roles/docker/README.md @@ -1,7 +1,7 @@ Docker ========= -Ensures docker package is installed, and optionally raises timeout for systemd-udevd.service to 5 minutes. +Ensures docker package or system container is installed, and optionally raises timeout for systemd-udevd.service to 5 minutes. Requirements ------------ @@ -11,8 +11,10 @@ Ansible 2.2 Role Variables -------------- -udevw_udevd_dir: location of systemd config for systemd-udevd.service +docker_conf_dir: location of the Docker configuration directory +docker_systemd_dir location of the systemd directory for Docker docker_udev_workaround: raises udevd timeout to 5 minutes (https://bugzilla.redhat.com/show_bug.cgi?id=1272446) +udevw_udevd_dir: location of systemd config for systemd-udevd.service Dependencies ------------ @@ -26,6 +28,7 @@ Example Playbook roles: - role: docker docker_udev_workaround: "true" + docker_use_system_container: False License ------- |