WarlockFish/fedora-infra_ansible
1
0
Fork 0
mirror of https://pagure.io/fedora-infra/ansible.git synced 2026-03-20 03:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

clean up some cri-o defaults

Browse Source
This commit is contained in:
Kevin Fenzi
2018-06-21 20:10:20 +00:00
parent a7e55f8536
commit c96ed19c02
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/groups/osbs-cluster.yml
View File

@@ -251,6 +251,8 @@
openshift_shared_infra: true,
openshift_deployment_type: "origin",
openshift_ansible_python_interpreter: "/usr/bin/python3",
openshift_ansible_use_crio: false,
openshift_ansible_crio_only: false,
when: env == 'production',
tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
}

4
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
View File

@@ -106,8 +106,12 @@ openshift_install_examples={{openshift_ansible_install_examples}}
# Disable pushing to dockerhub
#openshift_docker_disable_push_dockerhub=True
# Install and run cri-o.
{% if openshift_ansible_use_crio is defined %}
openshift_use_crio={{ openshift_ansible_use_crio }}
{% endif %}
{% if openshift_ansible_use_crio_only is defined %}
openshift_use_crio_only={{ openshift_ansible_crio_only }}
{% endif %}
# The following two variables are used when openshift_use_crio is True
# and cleans up after builds that pass through docker. When openshift_use_crio is True
# these variables are set to the defaults shown. You may override them here.