From 4a6cb460ca70f494702197362c479095a68ad091 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 27 Feb 2024 08:33:41 -0800 Subject: [PATCH] buildvm_s390x in boston: retire We have moved over to the rdu mainframe, drop all the bos kvm hosts. Signed-off-by: Kevin Fenzi --- inventory/builders | 30 ------------------- .../buildvm-s390x-15.s390.fedoraproject.org | 2 -- .../buildvm-s390x-16.s390.fedoraproject.org | 2 -- .../buildvm-s390x-17.s390.fedoraproject.org | 2 -- .../buildvm-s390x-18.s390.fedoraproject.org | 2 -- .../buildvm-s390x-19.s390.fedoraproject.org | 2 -- .../buildvm-s390x-20.s390.fedoraproject.org | 2 -- .../buildvm-s390x-21.s390.fedoraproject.org | 2 -- .../buildvm-s390x-22.s390.fedoraproject.org | 2 -- .../buildvm-s390x-23.s390.fedoraproject.org | 2 -- .../buildvm-s390x-24.s390.fedoraproject.org | 6 ---- .../buildvm-s390x-25.s390.fedoraproject.org | 2 -- .../buildvm-s390x-26.s390.fedoraproject.org | 6 ---- .../buildvm-s390x-27.s390.fedoraproject.org | 6 ---- ...uildvmhost-s390x-01.s390.fedoraproject.org | 28 ----------------- playbooks/groups/buildvm.yml | 2 +- playbooks/groups/virthost.yml | 2 +- roles/base/tasks/postfix.yml | 2 +- .../templates/iptables/iptables.kojibuilder | 2 +- roles/koji_builder/tasks/main.yml | 2 +- roles/rkhunter/templates/rkhunter.conf.j2 | 5 ---- 21 files changed, 5 insertions(+), 106 deletions(-) delete mode 100644 inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-22.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-23.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-25.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org delete mode 100644 inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org diff --git a/inventory/builders b/inventory/builders index 78e06d5d92..e7d97b5a21 100644 --- a/inventory/builders +++ b/inventory/builders @@ -112,20 +112,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 -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 -# These two have more cpu/memory for 'heavybuilder' channel -buildvm-s390x-26.s390.fedoraproject.org -buildvm-s390x-27.s390.fedoraproject.org [buildvm_s390x_rdu] buildvm-s390x-01.s390.fedoraproject.org @@ -152,21 +138,8 @@ bvmhost-s390x-01.stg.s390.fedoraproject.org bvmhost-s390x-01.s390.fedoraproject.org [buildvmhost] -#buildvmhost-aarch64-01.arm.fedoraproject.org -#buildvmhost-aarch64-02.arm.fedoraproject.org -buildvmhost-s390x-01.s390.fedoraproject.org bvmhost-s390x-01.stg.s390.fedoraproject.org bvmhost-s390x-01.s390.fedoraproject.org -# These are lenovo emags -#buildvmhost-aarch64-10.arm.fedoraproject.org -#buildvmhost-aarch64-11.arm.fedoraproject.org -#buildvmhost-aarch64-12.arm.fedoraproject.org -#buildvmhost-aarch64-13.arm.fedoraproject.org -#buildvmhost-aarch64-14.arm.fedoraproject.org -#buildvmhost-aarch64-15.arm.fedoraproject.org -#buildvmhost-aarch64-16.arm.fedoraproject.org -#buildvmhost-aarch64-17.arm.fedoraproject.org -#buildvmhost-aarch64-18.arm.fedoraproject.org # mt snow machines bvmhost-a64-01.iad2.fedoraproject.org bvmhost-a64-02.iad2.fedoraproject.org @@ -282,9 +255,6 @@ buildvm-ppc64le-33.iad2.fedoraproject.org buildvm-s390x-11.s390.fedoraproject.org buildvm-s390x-12.s390.fedoraproject.org buildvm-s390x-13.s390.fedoraproject.org -buildvm-s390x-15.s390.fedoraproject.org -buildvm-s390x-16.s390.fedoraproject.org -buildvm-s390x-17.s390.fedoraproject.org buildvm-a64-01.stg.iad2.fedoraproject.org buildvm-ppc64le-01.stg.iad2.fedoraproject.org buildvm-s390x-01.stg.s390.fedoraproject.org diff --git a/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org deleted file mode 100644 index 75acb95684..0000000000 --- a/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index 214a6bde54..0000000000 --- a/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index 78deb5ba34..0000000000 --- a/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index d2e1d05141..0000000000 --- a/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index c1c83fdd30..0000000000 --- a/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index 2608e0d25b..0000000000 --- a/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index e84a747ca6..0000000000 --- a/inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index 5398da15a6..0000000000 --- a/inventory/host_vars/buildvm-s390x-22.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index d73259a097..0000000000 --- a/inventory/host_vars/buildvm-s390x-23.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index ac747cfdec..0000000000 --- a/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org +++ /dev/null @@ -1,6 +0,0 @@ ---- -eth0_ipv4_ip: 10.16.0.35 -tcp_ports: [ - # allow incoming varnish requests to varnish cache - 80 -] diff --git a/inventory/host_vars/buildvm-s390x-25.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-25.s390.fedoraproject.org deleted file mode 100644 index 916e141336..0000000000 --- a/inventory/host_vars/buildvm-s390x-25.s390.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -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 deleted file mode 100644 index 9913964b18..0000000000 --- a/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org +++ /dev/null @@ -1,6 +0,0 @@ ---- -eth0_ipv4_ip: 10.16.0.37 -volgroup: /dev/fedora_linux_scsi -mem_size: 34816 -num_cpus: 6 -lvm_size: 204800 diff --git a/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org deleted file mode 100644 index c4708e08f5..0000000000 --- a/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org +++ /dev/null @@ -1,6 +0,0 @@ ---- -eth0_ipv4_ip: 10.16.0.38 -volgroup: /dev/fedora_linux_scsi -mem_size: 34816 -num_cpus: 6 -lvm_size: 204800 diff --git a/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org b/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org deleted file mode 100644 index 9fce28ae1b..0000000000 --- a/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org +++ /dev/null @@ -1,28 +0,0 @@ -dns1: 10.3.163.33 -dns2: 10.3.163.34 -dns_search1: fedoraproject.org -nbde: false -network_connections: - - autoconnect: true - ip: - address: - - '{{ vmbr_ipv4 }}/{{ vmbr_ipv4_nm }}' - dhcp4: false - dns: - - '{{ dns1 }}' - - '{{ dns2 }}' - dns_search: - - '{{ dns_search1 }}' - gateway4: '{{ vmbr_ipv4_gw }}' - name: vmbr - state: up - type: bridge - - mac: '2e:7e:13:ce:d4:d4' - master: vmbr - name: vmbr-port0 - state: up - type: ethernet -vmbr_ipv4: 10.16.0.10 -vmbr_ipv4_gw: 10.16.0.254 -vmbr_ipv4_nm: 24 -vmbr_port0_mac: '{{ mac0 }}' diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 0b0f367457..bdea1c8165 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -229,7 +229,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure sshfs on buildvm-s390x - hosts: buildvm-s390x-15.s390.fedoraproject.org:buildvm-s390x-16.s390.fedoraproject.org:buildvm-s390x-17.s390.fedoraproject.org:buildvm-s390x-11.s390.fedoraproject.org:buildvm-s390x-12.s390.fedoraproject.org:buildvm-s390x-13.s390.fedoraproject.org + hosts: buildvm-s390x-11.s390.fedoraproject.org:buildvm-s390x-12.s390.fedoraproject.org:buildvm-s390x-13.s390.fedoraproject.org tags: - sshfs user: root diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index ce55def306..ac2ea0ef7e 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -4,7 +4,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml" vars: - myhosts: "virthost:bvirthost:buildvmhost:colo_virt:!buildvmhost-s390x-01.s390.fedoraproject.org" + myhosts: "virthost:bvirthost:buildvmhost:colo_virt" - name: make virthost server system hosts: virthost:bvirthost:buildvmhost:colo_virt diff --git a/roles/base/tasks/postfix.yml b/roles/base/tasks/postfix.yml index 0f5e0b3ffa..e18510ee1f 100644 --- a/roles/base/tasks/postfix.yml +++ b/roles/base/tasks/postfix.yml @@ -49,7 +49,7 @@ value: false notify: - reload systemd - when: inventory_hostname.startswith(('buildvm-s390x','buildvmhost-s390x')) + when: inventory_hostname.startswith(('buildvm-s390x')) tags: - postfix - config diff --git a/roles/base/templates/iptables/iptables.kojibuilder b/roles/base/templates/iptables/iptables.kojibuilder index 1f370a0a24..3ac0cfd8d8 100644 --- a/roles/base/templates/iptables/iptables.kojibuilder +++ b/roles/base/templates/iptables/iptables.kojibuilder @@ -65,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-11', 'buildvm-s390x-12', 'buildvm-s390x-13', 'buildvm-s390x-15', 'buildvm-s390x-16','buildvm-s390x-17')) %} +{% if inventory_hostname.startswith (('buildvm-s390x-11', 'buildvm-s390x-12', 'buildvm-s390x-13')) %} # Allow SSHFS binding to koji01 -A OUTPUT -p tcp -m tcp -d 10.3.169.104 --dport 22 -j ACCEPT {% endif %} diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index 1d947cdd9b..f528f5ed16 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -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-11', 'buildvm-s390x-12', 'buildvm-s390x-13', 'buildvm-s390x-15', 'buildvm-s390x-16', 'buildvm-s390x-17')) + when: inventory_hostname.startswith(('buildvm-s390x-11', 'buildvm-s390x-12', 'buildvm-s390x-13')) tags: - koji_builder diff --git a/roles/rkhunter/templates/rkhunter.conf.j2 b/roles/rkhunter/templates/rkhunter.conf.j2 index 6de900d2ff..27ab72fe02 100644 --- a/roles/rkhunter/templates/rkhunter.conf.j2 +++ b/roles/rkhunter/templates/rkhunter.conf.j2 @@ -195,12 +195,7 @@ ALLOW_SSH_PROT_V1=0 # tests, the test names, and how rkhunter behaves when these options are used. # ENABLE_TESTS="all" -{% if ansible_hostname.startswith(('fed-cloud', 'buildvmhost-s390x')) %} -# Disable the promisc test here as openstack has it set on interfaces -DISABLE_TESTS="suspscan hidden_procs deleted_files packet_cap_apps apps promisc" -{% else %} DISABLE_TESTS="suspscan hidden_procs deleted_files packet_cap_apps apps" -{% endif %} # # The HASH_FUNC option can be used to specify the command to use