diff options
| author | Gan Huang <ghuang@redhat.com> | 2017-05-05 18:18:41 +0800 |
|---|---|---|
| committer | Gan Huang <ghuang@redhat.com> | 2017-05-05 22:39:54 +0800 |
| commit | e360372dcaf78648a329ce16f9d0365eed6636c8 (patch) | |
| tree | 1573e487e707dbaeb4ddeca031376dfb81a3d310 /roles/docker/tasks/main.yml | |
| parent | f7993afb2fec58b7bd13a70d812bf60deb5b1402 (diff) | |
| download | openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.gz openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.bz2 openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.xz openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.zip | |
Fix 1448368, and some other minors issues
Diffstat (limited to 'roles/docker/tasks/main.yml')
| -rw-r--r-- | roles/docker/tasks/main.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index e60dbe2d6..0c2b16acf 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -5,12 +5,13 @@ - include: udev_workaround.yml when: docker_udev_workaround | default(False) | bool +- set_fact: + l_use_system_container: "{{ openshift.docker.use_system_container | default(False) }}" + - name: Use Package Docker if Requested include: package_docker.yml - when: openshift.docker.use_system_container is not defined or openshift.docker.use_system_container == False + when: not l_use_system_container - name: Use System Container Docker if Requested include: systemcontainer_docker.yml - when: - - openshift.docker.use_system_container is defined - - openshift.docker.use_system_container is True + when: l_use_system_container |