infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

buildvm-s390x-14: move to rdu and setup as new varnish cache

Browse source 
Lets move this vm over to rdu, and set it up as a new varnish cache.
This way we can test 01 doing builds before moving others.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2024-02-20 17:38:34 -08:00
parent 0d2ae3a582
commit 1c4408ebe5
6 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inventory/builders
View file

@ -108,11 +108,11 @@ 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_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
buildvm-s390x-17.s390.fedoraproject.org
@ -128,6 +128,11 @@ buildvm-s390x-25.s390.fedoraproject.org
buildvm-s390x-26.s390.fedoraproject.org
buildvm-s390x-27.s390.fedoraproject.org
[buildvm_s390x_rdu]
buildvm-s390x-01.s390.fedoraproject.org
buildvm-s390x-01.stg.s390.fedoraproject.org
buildvm-s390x-14.s390.fedoraproject.org
[buildvm_s390x:children]
buildvm_s390x_zvm
buildvm_s390x_kvm
@ -264,6 +269,9 @@ buildvm-ppc64le-09.iad2.fedoraproject.org
buildvm-ppc64le-18.iad2.fedoraproject.org
buildvm-ppc64le-27.iad2.fedoraproject.org
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

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

@ -1,2 +1,16 @@
---
enc900_ipv4_ip: 10.16.0.24
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.24
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

4
playbooks/groups/buildvm.yml
View file

@ -211,7 +211,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: configure varnish cache
hosts: buildvm-s390x-24.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org:buildvm-s390x-07.s390.fedoraproject.org
hosts: buildvm-s390x-24.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org:buildvm-s390x-14.s390.fedoraproject.org
tags:
- varnish
user: root
@ -229,7 +229,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: configure sshfs on buildvm-s390x
hosts: buildvm-s390x-01.stg.s390.fedoraproject.org:buildvm-s390x-15.s390.fedoraproject.org:buildvm-s390x-16.s390.fedoraproject.org:buildvm-s390x-17.s390.fedoraproject.org
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-13.s390.fedoraproject.org:buildvm-s390x-13.s390.fedoraproject.org
tags:
- sshfs
user: root

2
playbooks/groups/koji-hub.yml
View file

@ -151,7 +151,7 @@
authorized_key: user="root"
key="{{ lookup('file', '{{ private }}/files/releng/sshkeys/primary-s390x-sshfs' + '-staging.pub' if env == 'staging' else '{{ private }}/files/releng/sshkeys/primary-s390x-sshfs.pub') }}"
state=present
key_options='command="internal-sftp",from="{{ '10.16.0.25' if env == 'staging' else '10.16.0.28,10.16.0.26,10.16.0.27' }}",restrict'
key_options='command="internal-sftp",from="{{ '10.16.0.28,10.16.0.26,10.16.0.27,10.1.102.21,10.1.102.22,10.1.102.23' }}",restrict'
tags:
- sshfs

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

@ -36,6 +36,7 @@
{% if host in groups['buildvm_s390x'] %}
-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.3.169.106 --dport 80 -j ACCEPT
-A OUTPUT -p tcp -m tcp -d 10.3.169.107 --dport 80 -j ACCEPT
{% endif %}

7
roles/koji_builder/templates/kojid.conf
View file

@ -33,9 +33,12 @@ failed_buildroot_lifetime=86400
failed_buildroot_lifetime=14400
{% endif %}
{% if host in groups['buildvm_s390x'] %}
# s390x builders use two local varnish cache instances
{% if host in groups['buildvm_s390x'] and not in groups['buildvm_s390x_rdu'] %}
# s390x builders in bos use two local varnish cache instances
topurl = http://kojipkgs-cache01.s390.fedoraproject.org http://kojipkgs-cache02.s390.fedoraproject.org
{% elif host in groups['buildvm_s390x'] and in groups['buildvm_s390x_rdu'] %}
# s390x builders in rdu use a local varnish cache instance
topurl = http://kojipkgs-cache03.s390.fedoraproject.org
{% elif host in groups['buildvm_s390x_stg'] %}
# s390x staging builder uses a local varnish cache
topurl = http://kojipkgs-cache01.stg.s390.fedoraproject.org {{koji_topurl}}