diff --git a/playbooks/groups/osbs/deploy-cluster.yml b/playbooks/groups/osbs/deploy-cluster.yml index 9737d0ed59..a5a16c923c 100644 --- a/playbooks/groups/osbs/deploy-cluster.yml +++ b/playbooks/groups/osbs/deploy-cluster.yml @@ -287,7 +287,7 @@ openshift_master_ha: false openshift_debug_level: 2 openshift_shared_infra: true - openshift_deployment_type: "openshift-enterprise" + openshift_deployment_type: "origin" openshift_ansible_python_interpreter: "/usr/bin/python3" openshift_ansible_use_crio: false openshift_ansible_crio_only: false diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2 index 8a6512721c..b1c4c0e6d4 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2 @@ -85,13 +85,15 @@ openshift_image_tag={{openshift_release}} # 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. # 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 {% if openshift_ansible_install_examples is defined %} openshift_install_examples={{openshift_ansible_install_examples}} {% endif %} +openshift_cluster_monitoring_operator_install = false openshift_web_console_install = false openshift_console_install = 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 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_password="{{ os_multiarch_registry_password }}" oreg_test_login=false