diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 34f6fc6398..8e5e822e6a 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -46,11 +46,11 @@ builders: p09_hypervisor_04: ppc64le: [1, 1, 1] x86_hypervisor_01: - x86_64: [0, 1, 1] + x86_64: [2, 1, 1] x86_hypervisor_02: - x86_64: [0, 1, 1] + x86_64: [2, 1, 1] x86_hypervisor_03: - x86_64: [0, 1, 1] + x86_64: [2, 1, 1] x86_hypervisor_04: x86_64: [2, 1, 1] diff --git a/inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org index 43bd21cc76..50e76b5346 100644 --- a/inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org @@ -19,7 +19,8 @@ mac5: b4:96:91:63:3b:e9 mac6: b4:96:91:63:3b:ea mac7: b4:96:91:63:3b:eb mac8: f4:02:70:d3:15:95 -libvirt_pool: copr_hv_x86_64_01 +libvirt_host: "[{{ br0_ipv6_ip }}]" +libvirt_pool: vmhost_x86_01 libvirt_pool_order_id: 7 libvirt_arch: x86_64 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 85a405294b..49e3560f72 100644 --- a/inventory/host_vars/vmhost-x86-copr02.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr02.rdu3.fedoraproject.org @@ -18,7 +18,8 @@ mac4: b4:96:91:63:3b:9d mac5: 84:16:0c:bc:24:e0 mac6: b4:96:91:63:3b:9e mac7: b4:96:91:63:3b:9f -libvirt_pool: copr_hv_x86_64_02 +libvirt_host: "[{{ br0_ipv6_ip }}]" +libvirt_pool: vmhost_x86_02 libvirt_pool_order_id: 8 libvirt_arch: x86_64 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 5e71cc7946..994869794f 100644 --- a/inventory/host_vars/vmhost-x86-copr03.rdu3.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr03.rdu3.fedoraproject.org @@ -18,7 +18,8 @@ mac4: "b4:96:91:63:3b:50" 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_host: "[{{ br0_ipv6_ip }}]" +libvirt_pool: vmhost_x86_03 libvirt_pool_order_id: 9 libvirt_arch: x86_64 network_connections: diff --git a/roles/copr/backend/templates/resalloc/pools.yaml.j2 b/roles/copr/backend/templates/resalloc/pools.yaml.j2 index 6f68c7f27c..734972945d 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml.j2 +++ b/roles/copr/backend/templates/resalloc/pools.yaml.j2 @@ -195,7 +195,7 @@ copr_osuosl_{% if cpu == "p10" %}p10{% else %}p09{% endif %}_{% if on_demand %}{ {% endmacro %} # x86_64 hypervisors -{% for hv in ["04"] %} +{% for hv in ["01", "02", "03", "04"] %} {% if "x86_hypervisor_" + hv in builders %} vmhost_x86_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}: max: {{ builders["x86_hypervisor_" + hv]["x86_64"][0] }}