summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-08-25 15:10:55 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-25 17:34:53 +0200
commit521b65b2a3c911c926974bd70309434d97e6fd0d (patch)
tree8f2abffe4139ab3885e3fe7239eda410f3dc28a9 /roles/openshift_node/tasks
parentaffdabe9d5182fb2dca846f4a236aa3af112b68b (diff)
downloadopenshift-521b65b2a3c911c926974bd70309434d97e6fd0d.tar.gz
openshift-521b65b2a3c911c926974bd70309434d97e6fd0d.tar.bz2
openshift-521b65b2a3c911c926974bd70309434d97e6fd0d.tar.xz
openshift-521b65b2a3c911c926974bd70309434d97e6fd0d.zip
cri-o: rename openshift_docker_use_crio to openshift_use_crio
It is confusing to have _docker_ in the name, since they are two different backends. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml4
-rw-r--r--roles/openshift_node/tasks/openvswitch_system_container.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 3353a22e3..fa0d4e323 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -4,7 +4,7 @@
msg: "SELinux is disabled, This deployment type requires that SELinux is enabled."
when:
- (not ansible_selinux or ansible_selinux.status != 'enabled') and deployment_type in ['enterprise', 'online', 'atomic-enterprise', 'openshift-enterprise']
- - not openshift_docker_use_crio | default(false)
+ - not openshift_use_crio | default(false)
- name: setup firewall
include: firewall.yml
@@ -103,7 +103,7 @@
name: cri-o
enabled: yes
state: restarted
- when: openshift_docker_use_crio | default(false)
+ when: openshift_use_crio | default(false)
- name: Install conntrack-tools package
package:
diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml
index dc1df9185..e09063aa5 100644
--- a/roles/openshift_node/tasks/openvswitch_system_container.yml
+++ b/roles/openshift_node/tasks/openvswitch_system_container.yml
@@ -1,6 +1,6 @@
---
- set_fact:
- l_use_crio: "{{ openshift_docker_use_crio | default(false) }}"
+ l_use_crio: "{{ openshift_use_crio | default(false) }}"
- set_fact:
l_service_name: "cri-o"