infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 7 Projects Releases Packages Wiki Activity Actions

buildvm-s390x: move rest of old zvm builders to rdu and kvm

Browse source 
We want to move (well, really re-install) all these over on the new lpar
in rdu. This will have much higher stats and be in general faster by
both network and cpu. Hopefully all these will replace all the old
boston ones.

We may need to break these up some more into smaller vm's if the number
isn't able to keep up ok. We can adjust after things are all working.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2024-02-21 09:49:28 -08:00
parent 5db13988ce
commit 334219e706
15 changed files with 199 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
inventory/builders
View file

@ -96,6 +96,10 @@ buildvm-a64-39.iad2.fedoraproject.org
buildvm-a64-40.iad2.fedoraproject.org
[buildvm_s390x_zvm]
[buildvm_s390x_kvm]
buildvm-s390x-01.s390.fedoraproject.org
buildvm-s390x-01.stg.s390.fedoraproject.org
buildvm-s390x-02.s390.fedoraproject.org
buildvm-s390x-03.s390.fedoraproject.org
buildvm-s390x-04.s390.fedoraproject.org
@ -108,10 +112,6 @@ buildvm-s390x-10.s390.fedoraproject.org
buildvm-s390x-11.s390.fedoraproject.org
buildvm-s390x-12.s390.fedoraproject.org
buildvm-s390x-13.s390.fedoraproject.org
[buildvm_s390x_kvm]
buildvm-s390x-01.s390.fedoraproject.org
buildvm-s390x-01.stg.s390.fedoraproject.org
buildvm-s390x-14.s390.fedoraproject.org
buildvm-s390x-15.s390.fedoraproject.org
buildvm-s390x-16.s390.fedoraproject.org
@ -131,6 +131,18 @@ buildvm-s390x-27.s390.fedoraproject.org
[buildvm_s390x_rdu]
buildvm-s390x-01.s390.fedoraproject.org
buildvm-s390x-01.stg.s390.fedoraproject.org
buildvm-s390x-02.s390.fedoraproject.org
buildvm-s390x-03.s390.fedoraproject.org
buildvm-s390x-04.s390.fedoraproject.org
buildvm-s390x-05.s390.fedoraproject.org
buildvm-s390x-06.s390.fedoraproject.org
buildvm-s390x-07.s390.fedoraproject.org
buildvm-s390x-08.s390.fedoraproject.org
buildvm-s390x-09.s390.fedoraproject.org
buildvm-s390x-10.s390.fedoraproject.org
buildvm-s390x-11.s390.fedoraproject.org
buildvm-s390x-12.s390.fedoraproject.org
buildvm-s390x-13.s390.fedoraproject.org
buildvm-s390x-14.s390.fedoraproject.org
[buildvm_s390x:children]

16
inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.12
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.12
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.13
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.13
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.14
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.14
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.15
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.15
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.16
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.16
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.17
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.17
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.18
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.18
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.19
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.19
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.20
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.20
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.21
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.21
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.22
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.22
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

16
inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org
View file

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.23
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.23
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

3
roles/base/templates/iptables/iptables.kojibuilder
View file

@ -37,6 +37,7 @@
-A OUTPUT -p tcp -m tcp -d 10.16.0.17 --dport 80 -j ACCEPT
-A OUTPUT -p tcp -m tcp -d 10.16.0.35 --dport 80 -j ACCEPT
-A OUTPUT -p tcp -m tcp -d 10.1.102.24 --dport 80 -j ACCEPT
-A OUTPUT -p tcp -m tcp -d 10.1.102.50 --dport 80 -j ACCEPT
-A OUTPUT -p tcp -m tcp -d 10.3.169.106 --dport 80 -j ACCEPT
-A OUTPUT -p tcp -m tcp -d 10.3.169.107 --dport 80 -j ACCEPT
{% endif %}
@ -64,7 +65,7 @@
# SSH
-A INPUT -p tcp -m tcp -s 10.3.160.0/19 --dport 22 -j ACCEPT
-A OUTPUT -p tcp -m tcp -d 10.3.160.0/19 --sport 22 -j ACCEPT
{% if inventory_hostname.startswith (('buildvm-s390x-15', 'buildvm-s390x-16','buildvm-s390x-17')) %}
{% if inventory_hostname.startswith (('buildvm-s390x-11', 'buildvm-s390x-12', 'buildvm-s390x-13', 'buildvm-s390x-15', 'buildvm-s390x-16','buildvm-s390x-17')) %}
# Allow SSHFS binding to koji01
-A OUTPUT -p tcp -m tcp -d 10.3.169.104 --dport 22 -j ACCEPT
{% endif %}

2
roles/koji_builder/tasks/main.yml
View file

@ -246,7 +246,7 @@
- name: make a mnt/koji link
file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji force=yes
when: inventory_hostname.startswith(('buildvm-s390x-15', 'buildvm-s390x-16', 'buildvm-s390x-17'))
when: inventory_hostname.startswith(('buildvm-s390x-11', 'buildvm-s390x-12', 'buildvm-s390x-13', 'buildvm-s390x-15', 'buildvm-s390x-16', 'buildvm-s390x-17'))
tags:
- koji_builder