diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-05 12:44:56 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2018-01-05 12:44:56 -0500 |
| commit | eacc12897ca86a255f89b8a4537ce2b7004cf319 (patch) | |
| tree | 6ea69dfb326cdb5b726d5f414f6d9a509db77875 /playbooks/container-runtime | |
| parent | 9f19afc7529bd7293433b27e834b9ee3479e646f (diff) | |
| download | openshift-eacc12897ca86a255f89b8a4537ce2b7004cf319.tar.gz openshift-eacc12897ca86a255f89b8a4537ce2b7004cf319.tar.bz2 openshift-eacc12897ca86a255f89b8a4537ce2b7004cf319.tar.xz openshift-eacc12897ca86a255f89b8a4537ce2b7004cf319.zip | |
Migrate to import_role for static role inclusion
In Ansible 2.2, the include_role directive came into existence as
a Tech Preview. It is still a Tech Preview through Ansible 2.4
(and in current devel branch), but with a noteable change. The
default behavior switched from static: true to static: false
because that functionality moved to the newly introduced
import_role directive (in order to stay consistent with include*
being dynamic in nature and `import* being static in nature).
The dynamic include is considerably more memory intensive as it will
dynamically create a role import for every host in the inventory
list to be used. (Also worth noting, there is at the time of this
writing an object allocation inefficiency in the dynamic include
that can in certain situations amplify this effect considerably)
This change is meant to mitigate the pressure on memory for the
Ansible control host.
We need to evaluate where it makes sense to dynamically include roles
and revert back to dynamic inclusion if and where it makes sense to do
so.
Diffstat (limited to 'playbooks/container-runtime')
| -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: |