From 345be768f947b4fb33f4189e581563fa4499106a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 26 Aug 2020 13:18:05 -0700 Subject: [PATCH] add a db-koji01.stg and a koji01.stg Signed-off-by: Kevin Fenzi --- .../db-koji01.stg.iad2.fedoraproject.org | 41 +++++++++++++++ .../db-koji01.stg.phx2.fedoraproject.org | 52 ------------------- ....org => koji01.stg.iad2.fedoraproject.org} | 14 ++--- inventory/inventory | 19 +++---- 4 files changed, 58 insertions(+), 68 deletions(-) create mode 100644 inventory/host_vars/db-koji01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/db-koji01.stg.phx2.fedoraproject.org rename inventory/host_vars/{koji01.stg.phx2.fedoraproject.org => koji01.stg.iad2.fedoraproject.org} (54%) diff --git a/inventory/host_vars/db-koji01.stg.iad2.fedoraproject.org b/inventory/host_vars/db-koji01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..d1c473aaa5 --- /dev/null +++ b/inventory/host_vars/db-koji01.stg.iad2.fedoraproject.org @@ -0,0 +1,41 @@ +--- +nm: 255.255.255.0 +gw: 10.3.167.254 +dns: 10.3.163.33 +volgroup: /dev/vg_guests +eth0_ip: 10.3.167.65 +#mac_address: 52:54:00:71:a6:eb +vmhost: bvirthost01.stg.iad2.fedoraproject.org +datacenter: iad2 + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2 +ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/ + +# This is a generic list, monitored by collectd +databases: +- koji + +# These are normally group variables, but in this case db servers are often different +lvm_size: 500000 +mem_size: 16384 +max_mem_size: "{{ mem_size }}" +num_cpus: 8 +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran,sysadmin-releng + +# kernel SHMMAX value +kernel_shmmax: 68719476736 + +# +# Only allow postgresql access from the frontend node. +# +custom_rules: [ + '-A INPUT -p tcp -m tcp -s 10.3.167.64 --dport 5432 -j ACCEPT', +] + +# +# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. +# +nrpe_procs_warn: 600 +nrpe_procs_crit: 700 +shared_buffers: "4GB" +effective_cache_size: "12GB" diff --git a/inventory/host_vars/db-koji01.stg.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.stg.phx2.fedoraproject.org deleted file mode 100644 index f63f3e5819..0000000000 --- a/inventory/host_vars/db-koji01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,52 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 -volgroup: /dev/vg_guests -eth0_ip: 10.5.128.98 -mac_address: 52:54:00:71:a6:eb -vmhost: bvirthost01.stg.phx2.fedoraproject.org -datacenter: phx2 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-31 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ - -# This is a generic list, monitored by collectd -databases: -- koji - -# These are normally group variables, but in this case db servers are often different -lvm_size: 500000 -mem_size: 16384 -max_mem_size: "{{ mem_size }}" -num_cpus: 8 -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran,sysadmin-releng - -# kernel SHMMAX value -kernel_shmmax: 68719476736 - -# -# Only allow postgresql access from the frontend node. -# -custom_rules: [ - '-A INPUT -p tcp -m tcp -s 10.5.128.139 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.128.98 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.128.99 --dport 5432 -j ACCEPT', - '-A INPUT -d 224.0.0.0/8 -j ACCEPT', - '-A INPUT -p vrrp -j ACCEPT', -] - -# -# Large updates pushes cause lots of db threads doing the tag moves, so up this from default. -# -nrpe_procs_warn: 600 -nrpe_procs_crit: 700 -shared_buffers: "4GB" -effective_cache_size: "12GB" - -# Keepalived variables -#keepalived_interface: eth0 -#keepalived_priority: 50 -#keepalived_ipaddress: 10.5.128.97/24 -#keepalived_routerid: 18 - diff --git a/inventory/host_vars/koji01.stg.phx2.fedoraproject.org b/inventory/host_vars/koji01.stg.iad2.fedoraproject.org similarity index 54% rename from inventory/host_vars/koji01.stg.phx2.fedoraproject.org rename to inventory/host_vars/koji01.stg.iad2.fedoraproject.org index 79fe545436..3127007a77 100644 --- a/inventory/host_vars/koji01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/koji01.stg.iad2.fedoraproject.org @@ -1,13 +1,13 @@ --- nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-kojistg -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +gw: 10.3.167.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-kojistg +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ volgroup: /dev/vg_guests -eth0_ip: 10.5.128.139 -vmhost: bvirthost01.stg.phx2.fedoraproject.org -datacenter: phx2 +eth0_ip: 10.3.167.64 +vmhost: bvirthost01.stg.iad2.fedoraproject.org +datacenter: iad2 fedmsg_koji_instance: primary diff --git a/inventory/inventory b/inventory/inventory index 1d46c987ef..5949823a57 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -202,7 +202,7 @@ db-openqa01.iad2.fedoraproject.org # db-fas01.stg.iad2.fedoraproject.org # db01.stg.iad2.fedoraproject.org # db03.stg.iad2.fedoraproject.org -# db-koji01.stg.iad2.fedoraproject.org +db-koji01.stg.iad2.fedoraproject.org # clients that talk to the main postgres servers [postgres_clients] @@ -216,11 +216,12 @@ db-openqa01.iad2.fedoraproject.org # busgateway01.stg.iad2.fedoraproject.org # datagrepper01.stg.iad2.fedoraproject.org # fedocal01.stg.iad2.fedoraproject.org -# koji01.stg.iad2.fedoraproject.org -# os-node01.stg.iad2.fedoraproject.org -# os-node02.stg.iad2.fedoraproject.org -# os-node03.stg.iad2.fedoraproject.org -# os-node04.stg.iad2.fedoraproject.org +koji01.stg.iad2.fedoraproject.org +os-node01.stg.iad2.fedoraproject.org +os-node02.stg.iad2.fedoraproject.org +os-node03.stg.iad2.fedoraproject.org +os-node04.stg.iad2.fedoraproject.org +os-node05.stg.iad2.fedoraproject.org [download_iad2] dl01.iad2.fedoraproject.org @@ -265,7 +266,7 @@ koji01.iad2.fedoraproject.org koji02.iad2.fedoraproject.org [koji_stg] -# koji01.stg.iad2.fedoraproject.org +koji01.stg.iad2.fedoraproject.org [kojipkgs] kojipkgs01.iad2.fedoraproject.org @@ -583,7 +584,7 @@ copr-fe-dev.aws.fedoraproject.org copr-keygen-dev.aws.fedoraproject.org # datagrepper01.stg.iad2.fedoraproject.org # db-fas01.stg.iad2.fedoraproject.org -# db-koji01.stg.iad2.fedoraproject.org +db-koji01.stg.iad2.fedoraproject.org # db01.stg.iad2.fedoraproject.org # db03.stg.iad2.fedoraproject.org # oci-candidate-registry01.stg.iad2.fedoraproject.org @@ -593,7 +594,7 @@ copr-keygen-dev.aws.fedoraproject.org # fedocal01.stg.iad2.fedoraproject.org # github2fedmsg01.stg.iad2.fedoraproject.org ipa01.stg.iad2.fedoraproject.org -# koji01.stg.iad2.fedoraproject.org +koji01.stg.iad2.fedoraproject.org # mailman01.stg.iad2.fedoraproject.org # mbs-backend01.stg.iad2.fedoraproject.org # mbs-frontend01.stg.iad2.fedoraproject.org