From bbaa05f4a25beb07e24a65745ce9c56bf07617b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Castillo=20Lema?= Date: Mon, 13 Jan 2025 18:12:46 +0100 Subject: [PATCH] [PERFSCALE-3634] Move to new QUADSv2 URLs (#585) * [PERFSCALE-3634] Move to new QUADSv2 URLs Signed-off-by: Jose Castillo Lema * Move to http and address rsevilla comments Signed-off-by: Jose Castillo Lema --------- Signed-off-by: Jose Castillo Lema --- ansible/roles/create-inventory/tasks/main.yml | 30 ++++--------------- ansible/vars/lab.yml | 2 +- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/ansible/roles/create-inventory/tasks/main.yml b/ansible/roles/create-inventory/tasks/main.yml index 5489afb7..2360f18b 100644 --- a/ansible/roles/create-inventory/tasks/main.yml +++ b/ansible/roles/create-inventory/tasks/main.yml @@ -11,15 +11,10 @@ # * Second machine is SNO cluster # -- name: Set ocp inventory download url from lab wiki - scalelab +- name: Set ocp inventory download url from lab wiki - scalelab and performancelab set_fact: - ocp_inventory_url: "https://{{ labs[lab]['quads'] }}/instack/{{ lab_cloud }}_ocpinventory.json" - when: ocp_inventory_override | string | length < 1 and lab == 'scalelab' - -- name: Set ocp inventory download url from lab wiki - performancelab - set_fact: - ocp_inventory_url: "http://{{ labs[lab]['quads'] }}/cloud/{{ lab_cloud }}_ocpinventory.json" - when: ocp_inventory_override | string | length < 1 and lab == 'performancelab' + ocp_inventory_url: "http://{{ labs[lab]['quads'] }}/instack/{{ lab_cloud }}_ocpinventory.json" + when: ocp_inventory_override | string | length < 1 and (lab == 'scalelab' or lab == 'performancelab') - name: Set ocp inventory download url to override set_fact: @@ -56,7 +51,7 @@ password: "{{ ocpinventory.json.nodes[0].pm_password }}" validate_certs: false register: quads_assignment - when: lab == "scalelab" + when: lab == "scalelab" or lab == "performancelab" - name: Public scalelab VLAN - Set addressing information set_fact: @@ -64,22 +59,7 @@ controlplane_network_prefix: "{{ quads_assignment.json.vlan.ip_range | ipaddr('prefix') }}" controlplane_network_gateway: "{{ quads_assignment.json.vlan.gateway }}" cluster_name: "vlan{{ quads_assignment.json.vlan.vlan_id }}" - when: lab == "scalelab" - - - name: Get VLAN info from performancelab quads - shell: | - set -o pipefail - curl -sk https://wiki.rdu3.labs.perfscale.redhat.com/vlans/ | grep -B7 {{ lab_cloud }} | sed -E 's###g'| tr '\n' ' ' | column -J --table-columns vlan_id,cidr,netmask,gateway,ipfree,owner,ticket,cloud - register: vlan_info - when: lab == "performancelab" - - - name: Public performancelab VLAN - Set addressing information - set_fact: - controlplane_network: "{{ (vlan_info.stdout | from_json).table[0].cidr }}" - controlplane_network_prefix: "{{ (vlan_info.stdout | from_json).table[0].cidr | ipaddr('prefix') }}" - controlplane_network_gateway: "{{ (vlan_info.stdout | from_json).table[0].gateway }}" - cluster_name: "vlan{{ (vlan_info.stdout | from_json).table[0].vlan_id }}" - when: lab == "performancelab" + when: lab == "scalelab" or lab == "performancelab" - name: Multi node cluster type tasks when: cluster_type == "mno" diff --git a/ansible/vars/lab.yml b/ansible/vars/lab.yml index 2b48524e..7cae16f7 100644 --- a/ansible/vars/lab.yml +++ b/ansible/vars/lab.yml @@ -17,7 +17,7 @@ labs: - 10.6.60.1 foreman: foreman.rdu3.labs.perfscale.redhat.com ntp_server: clock.redhat.com - quads: quads.rdu3.labs.perfscale.redhat.com + quads: quads2.rdu3.labs.perfscale.redhat.com scalelab: dns: - 10.1.36.1