diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-21 16:59:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 16:59:31 -0500 |
| commit | c007db1a6520b084edc7154fae863d67c230fe4b (patch) | |
| tree | a6a0c625ab4ad54030d3a1eecf92e6489faab7fe /roles/docker/tasks/main.yml | |
| parent | 8255f668ebac12171098f5ba6cbb74370ec3141c (diff) | |
| parent | a4c533e2a567562248768b2bc4998d1a36810894 (diff) | |
| download | openshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.gz openshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.bz2 openshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.xz openshift-c007db1a6520b084edc7154fae863d67c230fe4b.zip | |
Merge pull request #6144 from mtnbikenc/init-include-deprecation
Include Deprecation - Init Playbook Paths
Diffstat (limited to 'roles/docker/tasks/main.yml')
| -rw-r--r-- | roles/docker/tasks/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 69ee62790..55052b0a3 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -2,7 +2,7 @@ # These tasks dispatch to the proper set of docker tasks based on the # inventory:openshift_docker_use_system_container variable -- include: udev_workaround.yml +- include_tasks: udev_workaround.yml when: docker_udev_workaround | default(False) | bool - set_fact: @@ -20,7 +20,7 @@ - not l_use_crio_only - name: Use Package Docker if Requested - include: package_docker.yml + include_tasks: package_docker.yml when: - not l_use_system_container - not l_use_crio_only @@ -35,13 +35,13 @@ changed_when: false - name: Use System Container Docker if Requested - include: systemcontainer_docker.yml + include_tasks: systemcontainer_docker.yml when: - l_use_system_container - not l_use_crio_only - name: Add CRI-O usage Requested - include: systemcontainer_crio.yml + include_tasks: systemcontainer_crio.yml when: - l_use_crio - openshift_docker_is_node_or_master | bool |