OSBS: use quay.io for aarch64 OCP images.

Signed-off-by: Clement Verna <cverna@tutanota.com>

playbooks/groups/osbs/deploy-cluster.yml

@@ -268,11 +268,11 @@
       cluster_inventory_filename: "{{ inventory_filename }}"
       openshift_htpasswd_file: "/etc/origin/htpasswd"
       openshift_master_public_api_url: "https://{{ osbs_url }}:8443"
-      openshift_release: "v3.9.0"
+      openshift_release: "v3.11"
       openshift_ansible_path: "/root/openshift-ansible"
       openshift_ansible_pre_playbook: "playbooks/prerequisites.yml"
       openshift_ansible_playbook: "playbooks/deploy_cluster.yml"
-      openshift_ansible_version: "osbs-aarch64-fedora"
+      openshift_ansible_version: "openshift-ansible-3.11.51-1"
       openshift_ansible_ssh_user: root
       openshift_ansible_install_examples: false
       openshift_ansible_containerized_deploy: false
@@ -280,14 +280,15 @@
       openshift_cluster_nodes_group: "{{ aarch_nodes_group }}"
       openshift_cluster_infra_group: "{{ aarch_infra_group }}"
       openshift_auth_profile: "osbs"
-      openshift_cluster_url: "https://{{osbs_url}}"
+      openshift_cluster_url: "{{osbs_url}}"
       openshift_master_ha: false
       openshift_debug_level: 2
       openshift_shared_infra: true
-      openshift_deployment_type: "origin"
+      openshift_deployment_type: "openshift-enterprise"
       openshift_ansible_python_interpreter: "/usr/bin/python3"
       openshift_ansible_use_crio: false
       openshift_ansible_crio_only: false
+      openshift_arch: "aarch64"
       tags: ['openshift-cluster-aarch','ansible-ansible-openshift-ansible']
 
 - name: Setup OSBS requirements for OpenShift cluster hosts

roles/ansible-ansible-openshift-ansible/defaults/main.yml

@@ -84,3 +84,4 @@ openshift_cluster_masters_group: "openshift-cluster-masters"
 openshift_cluster_nodes_group: "openshift-cluster-nodes"
 openshift_cluster_infra_group: "openshift-cluster-nodes"
 
+openshift_arch: "x86_64"

roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2

@@ -224,7 +224,11 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha
 {% endif %}
 
 # If oreg_url points to a registry requiring authentication, provide the following:
-{% if env == "staging" %}
+{% if openshift_arch == "aarch64" %}
+oreg_url=quay.io/multi-arch/aarch64-${component}:${version}
+oreg_auth_user="{{ os_multiarch_registry_user }}"
+oreg_auth_password="{{ os_multiarch_registry_password }}"
+{% elif env == "staging" %}
 oreg_auth_user="{{ os_stg_registry_user }}"
 oreg_auth_password="{{ os_stg_registry_password }}"
 {% else %}