From be99e46e3e718dafe0131e244a8122abe339465a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 14 May 2024 15:40:18 -0700 Subject: [PATCH] db-datanommer02: moves to rhel9 Signed-off-by: Kevin Fenzi --- .../db-datanommer01.iad2.fedoraproject.org | 37 ------------------- .../db-datanommer02.iad2.fedoraproject.org | 14 ++++--- inventory/inventory | 2 - playbooks/groups/postgresql-server.yml | 4 +- 4 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 inventory/host_vars/db-datanommer01.iad2.fedoraproject.org diff --git a/inventory/host_vars/db-datanommer01.iad2.fedoraproject.org b/inventory/host_vars/db-datanommer01.iad2.fedoraproject.org deleted file mode 100644 index 8e39ee1440..0000000000 --- a/inventory/host_vars/db-datanommer01.iad2.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -# This is a generic list, monitored by collectd -databases: - - datanommer -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list, to be made publicly available -dbs_to_backup: - - datanommer2 -effective_cache_size: "12GB" -eth0_ipv4: "{{eth0_ip}}" -eth0_ipv4_gw: "10.3.163.254" -eth0_ipv4_ip: 10.3.163.43 -# kernel SHMMAX value -kernel_shmmax: 68719476736 -ks_repo: http://10.3.163.35/repo/rhel/RHEL9-x86_64/ -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 2000g -max_cpu: "{{ num_cpus * 2 }}" -max_mem_size: "{{ mem_size * 2 }}" -max_parallel_workers: 6 -max_parallel_workers_per_gather: 4 -max_worker_processes: 8 -mem_size: 32768 -nagios_Check_Services: - swap: false -num_cpus: 16 -sar_huge: true -sar_output_file: datagrepper.csv -# GDPR SAR variables - datanommer/datagrepper -sar_script: /usr/local/bin/datagrepper_sar.py -sar_script_user: root -shared_buffers: "4GB" -tcp_ports: [5432, 443] -vmhost: vmhost-x86-08.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db-datanommer02.iad2.fedoraproject.org b/inventory/host_vars/db-datanommer02.iad2.fedoraproject.org index f897a88a34..711250e83c 100644 --- a/inventory/host_vars/db-datanommer02.iad2.fedoraproject.org +++ b/inventory/host_vars/db-datanommer02.iad2.fedoraproject.org @@ -13,17 +13,19 @@ eth0_ipv4_gw: "10.3.163.254" eth0_ipv4_ip: 10.3.163.111 # kernel SHMMAX value kernel_shmmax: 68719476736 -ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/ -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2 +ks_repo: http://10.3.163.35/repo/rhel/RHEL9-x86_64/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel # These are normally group variables, but in this case db servers are often different -lvm_size: 1500g +lvm_size: 2000g +max_cpu: "{{ num_cpus * 2 }}" +max_mem_size: "{{ mem_size * 2 }}" max_parallel_workers: 6 max_parallel_workers_per_gather: 4 max_worker_processes: 8 -mem_size: 65536 +mem_size: 32768 nagios_Check_Services: swap: false -num_cpus: 8 +num_cpus: 16 sar_huge: true sar_output_file: datagrepper.csv # GDPR SAR variables - datanommer/datagrepper @@ -31,5 +33,5 @@ sar_script: /usr/local/bin/datagrepper_sar.py sar_script_user: root shared_buffers: "4GB" tcp_ports: [5432, 443] -vmhost: vmhost-x86-07.iad2.fedoraproject.org +vmhost: vmhost-x86-08.iad2.fedoraproject.org volgroup: /dev/vg_guests diff --git a/inventory/inventory b/inventory/inventory index 3d5b1b6c37..8bf5dfba29 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -160,7 +160,6 @@ autosign01.stg.iad2.fedoraproject.org db01.iad2.fedoraproject.org db03.iad2.fedoraproject.org db-fas01.iad2.fedoraproject.org -db-datanommer01.iad2.fedoraproject.org db-datanommer02.iad2.fedoraproject.org db-koji01.iad2.fedoraproject.org db-openqa01.iad2.fedoraproject.org @@ -174,7 +173,6 @@ db-koji01.stg.iad2.fedoraproject.org #copr-db-stg.aws.fedoraproject.org [datanommer_dbserver] -db-datanommer01.iad2.fedoraproject.org db-datanommer02.iad2.fedoraproject.org [datanommer_dbserver_stg] diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 9875669b43..48f439dbe7 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -4,12 +4,12 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml" vars: - myhosts: "db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org:db-datanommer01.stg.iad2.fedoraproject.org:db-datanommer02.iad2.fedoraproject.org" + myhosts: "db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org:db-datanommer01.stg.iad2.fedoraproject.org:db-datanommer02.iad2.fedoraproject.org" # Once the instance exists, configure it. - name: configure postgresql server system - hosts: db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org:db-datanommer01.stg.iad2.fedoraproject.org:db-datanommer02.iad2.fedoraproject.org + hosts: db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org:db-datanommer01.stg.iad2.fedoraproject.org:db-datanommer02.iad2.fedoraproject.org user: root gather_facts: True