Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

OSBS: openshift aarch64 specific variable

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2020-01-07 15:41:16 +01:00 • committed by Pierre-Yves Chibon
parent d10a0696a1
commit 2ec1756ac6
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/osbs/deploy-cluster.yml
View file

@ -287,7 +287,7 @@
openshift_master_ha: false openshift_master_ha: false
openshift_debug_level: 2 openshift_debug_level: 2
openshift_shared_infra: true openshift_shared_infra: true
openshift_deployment_type: "openshift-enterprise" openshift_deployment_type: "origin"
openshift_ansible_python_interpreter: "/usr/bin/python3" openshift_ansible_python_interpreter: "/usr/bin/python3"
openshift_ansible_use_crio: false openshift_ansible_use_crio: false
openshift_ansible_crio_only: false openshift_ansible_crio_only: false

8
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2
View file

@ -85,13 +85,15 @@ openshift_image_tag={{openshift_release}}
# Specify an exact rpm version to install or configure. # Specify an exact rpm version to install or configure.
# WARNING: This value will be used for all hosts in RPM based environments, even those that have another version installed. # WARNING: This value will be used for all hosts in RPM based environments, even those that have another version installed.
# This could potentially trigger an upgrade and downtime, so be careful with modifying this value after the cluster is set up. # This could potentially trigger an upgrade and downtime, so be careful with modifying this value after the cluster is set up.
#openshift_pkg_version=-3.5.0 {% if openshift_arch == "aarch64" %}
openshift_pkg_version=-3.11.1
{% endif %}
# Install the openshift examples # Install the openshift examples
{% if openshift_ansible_install_examples is defined %} {% if openshift_ansible_install_examples is defined %}
openshift_install_examples={{openshift_ansible_install_examples}} openshift_install_examples={{openshift_ansible_install_examples}}
{% endif %} {% endif %}
openshift_cluster_monitoring_operator_install = false
openshift_web_console_install = false openshift_web_console_install = false
openshift_console_install = false openshift_console_install = false
openshift_enable_olm=false openshift_enable_olm=false
@ -225,7 +227,7 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha
# If oreg_url points to a registry requiring authentication, provide the following: # If oreg_url points to a registry requiring authentication, provide the following:
{% if openshift_arch == "aarch64" %} {% if openshift_arch == "aarch64" %}
oreg_url=quay.io/multi-arch/aarch64-${component}:${version} oreg_url=quay.io/multi-arch/aarch64-openshift3-ose-${component}:${version}
oreg_auth_user="{{ os_multiarch_registry_user }}" oreg_auth_user="{{ os_multiarch_registry_user }}"
oreg_auth_password="{{ os_multiarch_registry_password }}" oreg_auth_password="{{ os_multiarch_registry_password }}"
oreg_test_login=false oreg_test_login=false