diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 2e030c1f60..75b69217da 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -52,7 +52,7 @@ builders: x86_hypervisor_03: x86_64: [0, 1, 1] x86_hypervisor_04: - x86_64: [0, 1, 1] + x86_64: [2, 1, 1] ibm_cloud_us_east_hp: s390x: [1, 1, 0] diff --git a/inventory/host_vars/vmhost-p09-copr02.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-p09-copr02.rdu3.fedoraproject.org index ca326e8e8d..986854cb1a 100644 --- a/inventory/host_vars/vmhost-p09-copr02.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-p09-copr02.rdu3.fedoraproject.org @@ -24,7 +24,7 @@ mac9: ac:1f:6b:a5:4e:f7 nbde: true libvirt_host: "[{{ br0_ipv6_ip }}]" libvirt_pool: vmhost_p09_02 -libvirt_pool_order_id: 7 +libvirt_pool_order_id: 0 libvirt_arch: ppc64le network_connections: # Bridge profile diff --git a/inventory/host_vars/vmhost-p09-copr03.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-p09-copr03.rdu3.fedoraproject.org index 227d1d44bb..a96aea3146 100644 --- a/inventory/host_vars/vmhost-p09-copr03.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-p09-copr03.rdu3.fedoraproject.org @@ -24,7 +24,7 @@ mac9: ac:1f:6b:8a:9a:33 nbde: true libvirt_host: "[{{ br0_ipv6_ip }}]" libvirt_pool: vmhost_p09_03 -libvirt_pool_order_id: 8 +libvirt_pool_order_id: 1 libvirt_arch: ppc64le network_connections: # Bridge profile diff --git a/inventory/host_vars/vmhost-p09-copr04.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-p09-copr04.rdu3.fedoraproject.org index 4fd4713e12..18c6276eca 100644 --- a/inventory/host_vars/vmhost-p09-copr04.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-p09-copr04.rdu3.fedoraproject.org @@ -24,7 +24,7 @@ mac9: ac:1f:6b:a4:e3:b3 nbde: true libvirt_host: "[{{ br0_ipv6_ip }}]" libvirt_pool: vmhost_p09_04 -libvirt_pool_order_id: 9 +libvirt_pool_order_id: 2 libvirt_arch: ppc64le network_connections: # Bridge profile diff --git a/inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org index 7a2af4f8ba..04a66ac812 100644 --- a/inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org @@ -19,7 +19,7 @@ mac5: "b4:96:91:63:3b:e9" mac6: "b4:96:91:63:3b:ea" mac7: "b4:96:91:63:3b:eb" libvirt_pool: copr_hv_x86_64_01 -libvirt_pool_order_id: 0 +libvirt_pool_order_id: 7 libvirt_arch: x86_64 nftables: false network_connections: diff --git a/inventory/host_vars/vmhost-x86-copr02.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr02.rdu3.fedoraproject.org index 56309d9f0f..2c82e9db40 100644 --- a/inventory/host_vars/vmhost-x86-copr02.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr02.rdu3.fedoraproject.org @@ -17,7 +17,7 @@ mac3: "b4:96:91:63:3b:9d" mac4: "b4:96:91:63:3b:9e" mac5: "b4:96:91:63:3b:9f" libvirt_pool: copr_hv_x86_64_02 -libvirt_pool_order_id: 1 +libvirt_pool_order_id: 8 libvirt_arch: x86_64 nftables: false network_connections: diff --git a/inventory/host_vars/vmhost-x86-copr03.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr03.rdu3.fedoraproject.org index aad02caf91..a8b92c0a84 100644 --- a/inventory/host_vars/vmhost-x86-copr03.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr03.rdu3.fedoraproject.org @@ -19,7 +19,7 @@ mac5: "b4:96:91:63:3b:51" mac6: "b4:96:91:63:3b:52" mac7: "b4:96:91:63:3b:53" libvirt_pool: copr_hv_x86_64_03 -libvirt_pool_order_id: 2 +libvirt_pool_order_id: 9 libvirt_arch: x86_64 nftables: false network_connections: diff --git a/inventory/host_vars/vmhost-x86-copr04.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr04.rdu3.fedoraproject.org index 013a2b0549..fb9ec00ce5 100644 --- a/inventory/host_vars/vmhost-x86-copr04.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr04.rdu3.fedoraproject.org @@ -18,10 +18,10 @@ mac4: "b4:96:91:63:3a:a0" mac5: "b4:96:91:63:3a:a1" mac6: "b4:96:91:63:3a:a2" mac7: "b4:96:91:63:3a:a3" -libvirt_pool: copr_hv_x86_64_04 +libvirt_host: "[{{ br0_ipv6_ip }}]" +libvirt_pool: vmhost_x86_04 libvirt_pool_order_id: 3 libvirt_arch: x86_64 -nftables: false network_connections: # Bridge profile - name: br0 diff --git a/roles/copr/backend/templates/provision/libvirt-new b/roles/copr/backend/templates/provision/libvirt-new index 90bbf300c9..3ccbe56e01 100755 --- a/roles/copr/backend/templates/provision/libvirt-new +++ b/roles/copr/backend/templates/provision/libvirt-new @@ -394,16 +394,13 @@ def get_fedora_ipv6_address(pool_id, id_in_pool, dev, log): hv_id, _, _ = get_hv_identification_from_pool_id(pool_id) hv_id = int(hv_id) - gateway = "2620:52:3:1:ffff:ffff:ffff:fffe" - base = "2620:52:3:1:dead:beef:cafe:c" - order_within_base = hv_id - - if hv_id in [7, 8, 9]: - # https://github.com/fedora-copr/copr/issues/3786#issuecomment-3412337856 - gateway = "2620:52:6:1161::1" - base = "2620:52:6:1161:dead:beef:cafe:c" - order_within_base = hv_id - 7 + # rdu-cc + # gateway = "2620:52:3:1:ffff:ffff:ffff:fffe" + # base = "2620:52:3:1:dead:beef:cafe:c" + # rdu3 https://github.com/fedora-copr/copr/issues/3786#issuecomment-3412337856 + gateway = "2620:52:6:1161::1" + base = "2620:52:6:1161:dead:beef:cafe:c" # The initial 256 addresses (:c0XX) is reserved for hypervisor machines # itself (not really in rdu3, per copr issue/3786 at least, but it doesn't @@ -413,11 +410,10 @@ def get_fedora_ipv6_address(pool_id, id_in_pool, dev, log): # each hypervisor has block of 64 IPs block = 64 - log.info("Hypervisor ID: %s", hv_id) # give 48 IPs to each hv (32 prod, some dev), currently 4*48=192 ips - offset = order_within_base * block + offset = hv_id * block if not dev: # give the first 8 addresses to Copr dev instance offset += 8 diff --git a/roles/copr/backend/templates/resalloc/pools.yaml.j2 b/roles/copr/backend/templates/resalloc/pools.yaml.j2 index 2cb8b73cec..0fc70c55af 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml.j2 +++ b/roles/copr/backend/templates/resalloc/pools.yaml.j2 @@ -193,9 +193,9 @@ copr_osuosl_{% if cpu == "p10" %}p10{% else %}p09{% endif %}_{% if on_demand %}{ {% endmacro %} # x86_64 hypervisors -{% for hv in ["01", "02", "03", "04"] %} +{% for hv in ["04"] %} {% if "x86_hypervisor_" + hv in builders %} -copr_hv_x86_64_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}: +vmhost_x86_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}: max: {{ builders["x86_hypervisor_" + hv]["x86_64"][0] }} max_starting: {{ builders["x86_hypervisor_" + hv]["x86_64"][1] }} max_prealloc: {{ builders["x86_hypervisor_" + hv]["x86_64"][2] }}