diff options
author | Steve Milner <smilner@redhat.com> | 2017-04-24 16:28:37 -0400 |
---|---|---|
committer | Steve Milner <smilner@redhat.com> | 2017-05-03 09:22:17 -0400 |
commit | 44115530148069e200e3a5d92b00e981aaa6e824 (patch) | |
tree | d2b30e5d22f58f1e9802b2f8ad7ae2a253b608d4 /roles/docker/vars/main.yml | |
parent | ba5c6594ade6679d055aaecc7c38836444f0f791 (diff) | |
download | openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.gz openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.bz2 openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.xz openshift-44115530148069e200e3a5d92b00e981aaa6e824.zip |
System container docker
This change allows for the use of either the traditional package install
of docker OR a system container install of docker.
Two new inventory options, openshift_docker_use_system_container and
openshift_docker_systemcontainer_image_registry_override, have been
added which are be used to install with a system container. By default
this option is commented out.
One new fact has been added:
- docker.service_name: docker by default, container-engine-docker
for system container
Diffstat (limited to 'roles/docker/vars/main.yml')
-rw-r--r-- | roles/docker/vars/main.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/docker/vars/main.yml b/roles/docker/vars/main.yml index 5237ed8f2..0082ded1e 100644 --- a/roles/docker/vars/main.yml +++ b/roles/docker/vars/main.yml @@ -1,3 +1,4 @@ --- -udevw_udevd_dir: /etc/systemd/system/systemd-udevd.service.d docker_systemd_dir: /etc/systemd/system/docker.service.d +docker_conf_dir: /etc/docker/ +udevw_udevd_dir: /etc/systemd/system/systemd-udevd.service.d |