[PERFSCALE-3634] Move to new QUADSv2 URLs (#585)

* [PERFSCALE-3634] Move to new QUADSv2 URLs

Signed-off-by: Jose Castillo Lema <[email protected]>

* Move to http and address rsevilla comments

Signed-off-by: Jose Castillo Lema <[email protected]>

---------

Signed-off-by: Jose Castillo Lema <[email protected]>

Author: josecastillolema

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,30 +51,15 @@
       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:
       controlplane_network: "{{ quads_assignment.json.vlan.ip_range }}"
       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#</?td>##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"

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