diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-12-05 15:14:49 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-12-07 09:25:31 -0500 |
commit | 2249ba3d08d1e6c55bf008609c9e4eace16bd917 (patch) | |
tree | 849e51214d2bd93e3fe8f9f4537d8f843416d4d8 /roles/container_runtime/tasks/common/pre.yml | |
parent | 4bcb53654635de775c60d0176e3aeeed4856fc86 (diff) | |
download | openshift-2249ba3d08d1e6c55bf008609c9e4eace16bd917.tar.gz openshift-2249ba3d08d1e6c55bf008609c9e4eace16bd917.tar.bz2 openshift-2249ba3d08d1e6c55bf008609c9e4eace16bd917.tar.xz openshift-2249ba3d08d1e6c55bf008609c9e4eace16bd917.zip |
Implement container_runtime playbooks and changes
This commit refactors some duplicate code, removes
usage of set_fact where not needed, and reorganizes
container_runtime role to use include_role.
Diffstat (limited to 'roles/container_runtime/tasks/common/pre.yml')
-rw-r--r-- | roles/container_runtime/tasks/common/pre.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/roles/container_runtime/tasks/common/pre.yml b/roles/container_runtime/tasks/common/pre.yml new file mode 100644 index 000000000..990fe66da --- /dev/null +++ b/roles/container_runtime/tasks/common/pre.yml @@ -0,0 +1,12 @@ +--- +- include_tasks: udev_workaround.yml + when: docker_udev_workaround | default(False) | bool + +- name: Add enterprise registry, if necessary + set_fact: + l2_docker_additional_registries: "{{ l2_docker_additional_registries + [openshift_docker_ent_reg] }}" + when: + - openshift.common.deployment_type == 'openshift-enterprise' + - openshift_docker_ent_reg != '' + - openshift_docker_ent_reg not in l2_docker_additional_registries + - not openshift_use_crio_only | bool |