diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-29 09:56:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 09:56:17 -0400 |
| commit | 4338dce09dbe5497f2a3700992eb4c5afeb4e6f6 (patch) | |
| tree | f105fd13921c5b87c19280dedfbae14a3f125333 /roles/openshift_node/tasks | |
| parent | ab7b515d8ed8576b23147e64e4da73e6dea41df7 (diff) | |
| parent | f1bb63e076a764732dfcc2da1536591bfdc15cb8 (diff) | |
| download | openshift-4338dce09dbe5497f2a3700992eb4c5afeb4e6f6.tar.gz openshift-4338dce09dbe5497f2a3700992eb4c5afeb4e6f6.tar.bz2 openshift-4338dce09dbe5497f2a3700992eb4c5afeb4e6f6.tar.xz openshift-4338dce09dbe5497f2a3700992eb4c5afeb4e6f6.zip | |
Merge pull request #5214 from giuseppe/rename_crio_variable
crio: rename openshift_docker_use_crio to openshift_use_crio
Diffstat (limited to 'roles/openshift_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/openvswitch_system_container.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 81456eac9..da16e7592 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 @@ -93,7 +93,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" |