summaryrefslogtreecommitdiffstats
path: root/playbooks/container-runtime/private/config.yml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-05 16:19:23 -0500
committerGitHub <noreply@github.com>2018-01-05 16:19:23 -0500
commit31d19c5e68e61d004a93db738772c120e7dd0eb5 (patch)
tree1b5a2642ca9645ab97aa79cd1ca36537d8b64f8c /playbooks/container-runtime/private/config.yml
parentcaec381b6cd0ea632cfe927c23b6229ab69e834a (diff)
parenteacc12897ca86a255f89b8a4537ce2b7004cf319 (diff)
downloadopenshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.gz
openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.bz2
openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.xz
openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.zip
Merge pull request #6627 from sdodson/import_role
Migrate to import_role for static role inclusion
Diffstat (limited to 'playbooks/container-runtime/private/config.yml')
-rw-r--r--playbooks/container-runtime/private/config.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/container-runtime/private/config.yml b/playbooks/container-runtime/private/config.yml
index d8fc93710..dd13fa4a2 100644
--- a/playbooks/container-runtime/private/config.yml
+++ b/playbooks/container-runtime/private/config.yml
@@ -8,19 +8,19 @@
roles:
- role: container_runtime
tasks:
- - include_role:
+ - import_role:
name: container_runtime
tasks_from: package_docker.yml
when:
- not openshift_docker_use_system_container | bool
- not openshift_use_crio_only | bool
- - include_role:
+ - import_role:
name: container_runtime
tasks_from: systemcontainer_docker.yml
when:
- openshift_docker_use_system_container | bool
- not openshift_use_crio_only | bool
- - include_role:
+ - import_role:
name: container_runtime
tasks_from: systemcontainer_crio.yml
when: