summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks/openvswitch_system_container.yml
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_node/tasks/openvswitch_system_container.yml')
-rw-r--r--roles/openshift_node/tasks/openvswitch_system_container.yml14
1 files changed, 3 insertions, 11 deletions
diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml
index 8c3548475..b61bc84c1 100644
--- a/roles/openshift_node/tasks/openvswitch_system_container.yml
+++ b/roles/openshift_node/tasks/openvswitch_system_container.yml
@@ -1,19 +1,11 @@
---
- set_fact:
- l_use_crio: "{{ openshift_use_crio | default(false) }}"
-
-- set_fact:
l_service_name: "cri-o"
- when: l_use_crio
+ when: openshift_use_crio
- set_fact:
- l_service_name: "{{ openshift.docker.service_name }}"
- when: not l_use_crio
-
-- name: Ensure proxies are in the atomic.conf
- include_role:
- name: openshift_atomic
- tasks_from: proxy
+ l_service_name: "{{ openshift_docker_service_name }}"
+ when: not openshift_use_crio
- name: Pre-pull OpenVSwitch system container image
command: >