From c8b7521e9850d3ef8495ada7be66ecd7329cd71d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 26 Jan 2022 10:28:09 -0800 Subject: [PATCH] buildvm_s390x: reorg group and host vars, split zvm/kvm lpars We can consolidate a bunch of things here in group vars that was in host vars and avoid a bunch of duplication. So, now: all the buildvm_s390x builders are in that group, but there's now a buildvm_s390x_kvm and buildvm_s390x_zvm for those seperate lpars and those define the default network setup for each lpar. Finally the hosts vars only now needs to have the ip addresses. Signed-off-by: Kevin Fenzi --- inventory/builders | 28 ++++------------- inventory/group_vars/buildvm_s390x | 12 -------- inventory/group_vars/buildvm_s390x_kvm | 16 ++++++++++ inventory/group_vars/buildvm_s390x_zvm | 26 ++++++++++++++++ .../buildvm-s390x-01.s390.fedoraproject.org | 2 ++ ...uildvm-s390x-01.stg.s390.fedoraproject.org | 28 +++++++++++++++-- .../buildvm-s390x-02.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-03.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-04.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-05.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-06.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-07.s390.fedoraproject.org | 30 ------------------- .../buildvm-s390x-08.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-09.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-10.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-11.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-12.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-13.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-14.s390.fedoraproject.org | 2 ++ .../buildvm-s390x-15.s390.fedoraproject.org | 25 +--------------- .../buildvm-s390x-16.s390.fedoraproject.org | 25 +--------------- .../buildvm-s390x-17.s390.fedoraproject.org | 25 +--------------- .../buildvm-s390x-18.s390.fedoraproject.org | 25 +--------------- .../buildvm-s390x-19.s390.fedoraproject.org | 26 +--------------- .../buildvm-s390x-20.s390.fedoraproject.org | 25 +--------------- .../buildvm-s390x-21.s390.fedoraproject.org | 25 +--------------- .../buildvm-s390x-22.s390.fedoraproject.org | 25 +--------------- .../buildvm-s390x-23.s390.fedoraproject.org | 25 +--------------- .../buildvm-s390x-24.s390.fedoraproject.org | 28 +---------------- .../buildvm-s390x-25.s390.fedoraproject.org | 29 +----------------- .../buildvm-s390x-26.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-27.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-28.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-29.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-30.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-31.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-32.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-33.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-34.s390.fedoraproject.org | 30 +------------------ .../buildvm-s390x-35.s390.fedoraproject.org | 30 +------------------ 40 files changed, 119 insertions(+), 630 deletions(-) create mode 100644 inventory/group_vars/buildvm_s390x_kvm create mode 100644 inventory/group_vars/buildvm_s390x_zvm create mode 100644 inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org create mode 100644 inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org diff --git a/inventory/builders b/inventory/builders index bb6012fb4e..7b122ebf55 100644 --- a/inventory/builders +++ b/inventory/builders @@ -127,7 +127,7 @@ buildvm-a32-31.iad2.fedoraproject.org buildvm-a32-32.iad2.fedoraproject.org buildvm-a32-33.iad2.fedoraproject.org -[buildvm_s390x] +[buildvm_s390x_zvm] buildvm-s390x-01.s390.fedoraproject.org buildvm-s390x-02.s390.fedoraproject.org buildvm-s390x-03.s390.fedoraproject.org @@ -142,28 +142,6 @@ buildvm-s390x-11.s390.fedoraproject.org buildvm-s390x-12.s390.fedoraproject.org buildvm-s390x-13.s390.fedoraproject.org buildvm-s390x-14.s390.fedoraproject.org -# These are kvm builders -buildvm-s390x-15.s390.fedoraproject.org -buildvm-s390x-16.s390.fedoraproject.org -buildvm-s390x-17.s390.fedoraproject.org -buildvm-s390x-18.s390.fedoraproject.org -buildvm-s390x-19.s390.fedoraproject.org -buildvm-s390x-20.s390.fedoraproject.org -buildvm-s390x-21.s390.fedoraproject.org -buildvm-s390x-22.s390.fedoraproject.org -buildvm-s390x-23.s390.fedoraproject.org -buildvm-s390x-24.s390.fedoraproject.org -buildvm-s390x-25.s390.fedoraproject.org -buildvm-s390x-26.s390.fedoraproject.org -buildvm-s390x-27.s390.fedoraproject.org -buildvm-s390x-28.s390.fedoraproject.org -buildvm-s390x-29.s390.fedoraproject.org -buildvm-s390x-30.s390.fedoraproject.org -buildvm-s390x-31.s390.fedoraproject.org -buildvm-s390x-32.s390.fedoraproject.org -buildvm-s390x-33.s390.fedoraproject.org -buildvm-s390x-34.s390.fedoraproject.org -buildvm-s390x-35.s390.fedoraproject.org [buildvm_s390x_kvm] buildvm-s390x-15.s390.fedoraproject.org @@ -188,6 +166,10 @@ buildvm-s390x-33.s390.fedoraproject.org buildvm-s390x-34.s390.fedoraproject.org buildvm-s390x-35.s390.fedoraproject.org +[buildvm_s390x:children] +buildvm_s390x_zvm +buildvm_s390x_kvm + [buildvmhost] #buildvmhost-aarch64-01.arm.fedoraproject.org #buildvmhost-aarch64-02.arm.fedoraproject.org diff --git a/inventory/group_vars/buildvm_s390x b/inventory/group_vars/buildvm_s390x index 8a7cdad22c..448dbfd7ed 100644 --- a/inventory/group_vars/buildvm_s390x +++ b/inventory/group_vars/buildvm_s390x @@ -8,21 +8,9 @@ csi_relationship: | * Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver. * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new csi_security_category: High -dns: 10.3.163.33 -eth0_ipv4_gw: 10.16.0.254 host_group: kojibuilder koji_hub_nfs: "fedora_koji" koji_server_url: "https://koji.fedoraproject.org/kojihub" koji_topurl: "https://kojipkgs.fedoraproject.org/" koji_weburl: "https://koji.fedoraproject.org/koji" -ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/35/Server/s390x/os/ -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora -lvm_size: 102400 -main_bridge: vmbr -max_mem_size: "{{ mem_size }}" -mem_size: 10240 -num_cpus: 2 varnish_group: s390kojipkgs -virt_install_command: "{{ virt_install_command_s390x_one_nic }}" -vmhost: buildvmhost-s390x-01.s390.fedoraproject.org -volgroup: /dev/fedora_linux_lpar_1 diff --git a/inventory/group_vars/buildvm_s390x_kvm b/inventory/group_vars/buildvm_s390x_kvm new file mode 100644 index 0000000000..4841aca294 --- /dev/null +++ b/inventory/group_vars/buildvm_s390x_kvm @@ -0,0 +1,16 @@ +--- +dns1: 10.3.163.33 +dns2: 10.3.163.34 +dns_search1: "iad2.fedoraproject.org" +dns_search2: "fedoraproject.org" +eth0_ipv4_gw: 10.16.0.254 +ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/35/Server/s390x/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +lvm_size: 102400 +main_bridge: vmbr +max_mem_size: "{{ mem_size }}" +mem_size: 10240 +num_cpus: 2 +virt_install_command: "{{ virt_install_command_s390x_one_nic }}" +vmhost: buildvmhost-s390x-01.s390.fedoraproject.org +volgroup: /dev/fedora_linux_lpar_1 diff --git a/inventory/group_vars/buildvm_s390x_zvm b/inventory/group_vars/buildvm_s390x_zvm new file mode 100644 index 0000000000..df97a79408 --- /dev/null +++ b/inventory/group_vars/buildvm_s390x_zvm @@ -0,0 +1,26 @@ +--- +dns1: 10.3.163.33 +dns2: 10.3.163.34 +dns_search1: "iad2.fedoraproject.org" +dns_search2: "fedoraproject.org" +enc900_ipv4_gw: 10.16.0.254 +enc900_ipv4_nm: 24 +has_ipv4: yes +network_connections: + - autoconnect: yes + ip: + address: + - "{{ enc900_ipv4_ip }}/{{ enc900_ipv4_nm }}" + dhcp4: no + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - "{{ dns_search1 }}" + - "{{ dns_search2 }}" + gateway4: "{{ enc900_ipv4_gw }}" + mac: "{{ ansible_default_ipv4.macaddress }}" + name: enc900 + state: up + type: ethernet +varnish_group: s390kojipkgs diff --git a/inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org new file mode 100644 index 0000000000..58ea801fbe --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.11 diff --git a/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org index 833d8ccbf2..491b86ccc1 100644 --- a/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org @@ -1,5 +1,27 @@ --- -dns: 10.3.163.33 -eth0_ipv4_ip: 10.16.0.25 -eth0_ipv4_gw: 10.16.0.254 +dns1: 10.3.163.33 +dns2: 10.3.163.34 +dns_search1: "iad2.fedoraproject.org" +dns_search2: "fedoraproject.org" +enc900_ipv4_ip: 10.0.0.25 +enc900_ipv4_gw: 10.16.0.254 +enc900_ipv4_nm: 24 +has_ipv4: yes +network_connections: + - autoconnect: yes + ip: + address: + - "{{ enc900_ipv4_ip }}/{{ enc900_ipv4_nm }}" + dhcp4: no + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - "{{ dns_search1 }}" + - "{{ dns_search2 }}" + gateway4: "{{ enc900_ipv4_gw }}" + mac: "{{ ansible_default_ipv4.macaddress }}" + name: enc900 + state: up + type: ethernet varnish_group: s390kojipkgs diff --git a/inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org new file mode 100644 index 0000000000..f767c03d40 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.12 diff --git a/inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org new file mode 100644 index 0000000000..5c246c0472 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.13 diff --git a/inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org new file mode 100644 index 0000000000..08eda881cc --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.14 diff --git a/inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org new file mode 100644 index 0000000000..01eac0aebb --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.15 diff --git a/inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org new file mode 100644 index 0000000000..38aad16098 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.16 diff --git a/inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org index c27a53566c..6a217dbf63 100644 --- a/inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org @@ -1,32 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" enc900_ipv4: 10.16.0.17 -enc900_ipv4_gw: 10.16.0.254 -enc900_ipv4_nm: 24 -enc900_mac: "{{ mac0 }}" -eth0_ip: 10.16.0.17 -gw: 10.16.0.254 -has_ipv4: yes -mac0: 02:d3:fa:02:00:08 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ enc900_ipv4 }}/{{ enc900_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enc900_ipv4_gw }}" - mac: "{{ enc900_mac }}" - name: enc900 - state: up - type: ethernet -nm: 255.255.255.0 -varnish_group: s390kojipkgs diff --git a/inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org new file mode 100644 index 0000000000..587f92986a --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.18 diff --git a/inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org new file mode 100644 index 0000000000..80d4157676 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.19 diff --git a/inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org new file mode 100644 index 0000000000..1758229e95 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.20 diff --git a/inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org new file mode 100644 index 0000000000..00f7fe36d6 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.21 diff --git a/inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org new file mode 100644 index 0000000000..3dc0967576 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.22 diff --git a/inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org new file mode 100644 index 0000000000..a34377b873 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.23 diff --git a/inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org new file mode 100644 index 0000000000..3397d407fe --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +enc900_ipv4: 10.16.0.24 diff --git a/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org index e6e774ce51..75acb95684 100644 --- a/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org @@ -1,25 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.26 -eth0_ipv4_gw: 10.16.0.254 -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.26 diff --git a/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org index e07456c2d0..214a6bde54 100644 --- a/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org @@ -1,25 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.27 -eth0_ipv4_gw: 10.16.0.254 -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.27 diff --git a/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org index e093b708c3..78deb5ba34 100644 --- a/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org @@ -1,25 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.28 -eth0_ipv4_gw: 10.16.0.254 -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.28 diff --git a/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org index 7e747fddb5..d2e1d05141 100644 --- a/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org @@ -1,25 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.29 -eth0_ipv4_gw: 10.16.0.254 -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.29 diff --git a/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org index 70d09c57cd..c1c83fdd30 100644 --- a/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org @@ -1,26 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.30 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.30 diff --git a/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org index 66b6992483..2608e0d25b 100644 --- a/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org @@ -1,25 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.31 -eth0_ipv4_gw: 10.16.0.254 -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.31 diff --git a/inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org index 2bb5b97aac..e84a747ca6 100644 --- a/inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org @@ -1,25 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.32 -eth0_ipv4_gw: 10.16.0.254 -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.32 diff --git a/inventory/host_vars/buildvm-s390x-22.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-22.s390.fedoraproject.org index 5ea017352e..5398da15a6 100644 --- a/inventory/host_vars/buildvm-s390x-22.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-22.s390.fedoraproject.org @@ -1,25 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.33 -eth0_ipv4_gw: 10.16.0.254 -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.33 diff --git a/inventory/host_vars/buildvm-s390x-23.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-23.s390.fedoraproject.org index 08b6fbc531..d73259a097 100644 --- a/inventory/host_vars/buildvm-s390x-23.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-23.s390.fedoraproject.org @@ -1,25 +1,2 @@ --- -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.34 -eth0_ipv4_gw: 10.16.0.254 -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.34 diff --git a/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org index 05db61211d..0f76067027 100644 --- a/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org @@ -1,28 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.35 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet +eth0_ipv4_ip: 10.16.0.35 diff --git a/inventory/host_vars/buildvm-s390x-25.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-25.s390.fedoraproject.org index a39b895feb..916e141336 100644 --- a/inventory/host_vars/buildvm-s390x-25.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-25.s390.fedoraproject.org @@ -1,29 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.36 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.36 diff --git a/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org index 86b200c359..f0d101e4d7 100644 --- a/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.37 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.37 diff --git a/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org index 05a3cc5e44..16aef47c5c 100644 --- a/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.38 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.38 diff --git a/inventory/host_vars/buildvm-s390x-28.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-28.s390.fedoraproject.org index 93967ea162..88ba312344 100644 --- a/inventory/host_vars/buildvm-s390x-28.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-28.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.39 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.39 diff --git a/inventory/host_vars/buildvm-s390x-29.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-29.s390.fedoraproject.org index 833af3ba2b..0437bba2a8 100644 --- a/inventory/host_vars/buildvm-s390x-29.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-29.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.40 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.40 diff --git a/inventory/host_vars/buildvm-s390x-30.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-30.s390.fedoraproject.org index e329eabdbe..b70ec450db 100644 --- a/inventory/host_vars/buildvm-s390x-30.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-30.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.41 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.41 diff --git a/inventory/host_vars/buildvm-s390x-31.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-31.s390.fedoraproject.org index 6c007ed2b8..bd8850ffad 100644 --- a/inventory/host_vars/buildvm-s390x-31.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-31.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.42 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.42 diff --git a/inventory/host_vars/buildvm-s390x-32.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-32.s390.fedoraproject.org index 0ce9b8ec01..bfcda6f1fd 100644 --- a/inventory/host_vars/buildvm-s390x-32.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-32.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.43 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.43 diff --git a/inventory/host_vars/buildvm-s390x-33.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-33.s390.fedoraproject.org index a5a19679fc..7bca9b8acf 100644 --- a/inventory/host_vars/buildvm-s390x-33.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-33.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.44 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.44 diff --git a/inventory/host_vars/buildvm-s390x-34.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-34.s390.fedoraproject.org index a4a94a89e0..408ca58362 100644 --- a/inventory/host_vars/buildvm-s390x-34.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-34.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.45 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.45 diff --git a/inventory/host_vars/buildvm-s390x-35.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-35.s390.fedoraproject.org index 14f5448710..a9f44b1070 100644 --- a/inventory/host_vars/buildvm-s390x-35.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-35.s390.fedoraproject.org @@ -1,30 +1,2 @@ --- -# needed because this host has a varnish cache on it. -custom_rules: ['-A INPUT -s 10.16.0.0/24 -p tcp -m tcp --dport 80 -j ACCEPT'] -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: "iad2.fedoraproject.org" -dns_search2: "fedoraproject.org" -eth0_ipv4: 10.16.0.46 -eth0_ipv4_gw: 10.16.0.254 -eth0_mac: "{{ mac0 }}" -has_ipv4: yes -lvm_size: 153600 -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - state: up - type: ethernet -volgroup: /dev/fedora_linux_scsi +eth0_ipv4_ip: 10.16.0.46