diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-05 16:19:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 16:19:23 -0500 |
| commit | 31d19c5e68e61d004a93db738772c120e7dd0eb5 (patch) | |
| tree | 1b5a2642ca9645ab97aa79cd1ca36537d8b64f8c /playbooks/container-runtime/private | |
| parent | caec381b6cd0ea632cfe927c23b6229ab69e834a (diff) | |
| parent | eacc12897ca86a255f89b8a4537ce2b7004cf319 (diff) | |
| download | openshift-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')
| -rw-r--r-- | playbooks/container-runtime/private/config.yml | 6 | ||||
| -rw-r--r-- | playbooks/container-runtime/private/setup_storage.yml | 2 |
2 files changed, 4 insertions, 4 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: diff --git a/playbooks/container-runtime/private/setup_storage.yml b/playbooks/container-runtime/private/setup_storage.yml index 54fa5ca66..357f67f0c 100644 --- a/playbooks/container-runtime/private/setup_storage.yml +++ b/playbooks/container-runtime/private/setup_storage.yml @@ -8,7 +8,7 @@ roles: - role: container_runtime tasks: - - include_role: + - import_role: name: container_runtime tasks_from: docker_storage_setup_overlay.yml when: |