From bf5a81829c41d85ae3e1a1e3f01001241a804f8a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 14 May 2024 15:06:43 -0700 Subject: [PATCH] db01 migrates to rhel9/pgsql-15 Signed-off-by: Kevin Fenzi --- .../host_vars/db01.iad2.fedoraproject.org | 12 +-- .../host_vars/db02.iad2.fedoraproject.org | 76 ------------------- inventory/inventory | 1 - playbooks/groups/postgresql-server.yml | 4 +- roles/postgresql_server/tasks/main.yml | 4 +- 5 files changed, 11 insertions(+), 86 deletions(-) delete mode 100644 inventory/host_vars/db02.iad2.fedoraproject.org diff --git a/inventory/host_vars/db01.iad2.fedoraproject.org b/inventory/host_vars/db01.iad2.fedoraproject.org index a553310832..3db15334e8 100644 --- a/inventory/host_vars/db01.iad2.fedoraproject.org +++ b/inventory/host_vars/db01.iad2.fedoraproject.org @@ -53,10 +53,12 @@ dbs_to_backup: effective_cache_size: "50GB" eth0_ipv4_gw: 10.3.163.254 eth0_ipv4_ip: 10.3.163.41 -ks_repo: http://38.145.60.16/repo/rhel/RHEL8-x86_64/ -ks_url: http://38.145.60.16/repo/rhel/ks/kvm-rhel-8-ext +ks_repo: http://38.145.60.16/repo/rhel/RHEL9-x86_64/ +ks_url: http://38.145.60.16/repo/rhel/ks/kvm-rhel # These are normally group variables, but in this case db servers are often different -lvm_size: 500000 +lvm_size: 1500000 +max_cpu: "{{ num_cpus }}" +max_mem_size: "{{ mem_size * 2 }}" max_stack_depth: "6MB" max_worker_processes: 12 mem_size: 65536 @@ -67,8 +69,8 @@ nrpe_procs_crit: 900 # db01 handles lots of apps, could have many procs if they are busy. # nrpe_procs_warn: 800 -num_cpus: 24 +num_cpus: 32 # Should be 0.25 of memory shared_buffers: "24GB" -vmhost: vmhost-x86-03.iad2.fedoraproject.org +vmhost: vmhost-x86-08.iad2.fedoraproject.org volgroup: /dev/vg_guests diff --git a/inventory/host_vars/db02.iad2.fedoraproject.org b/inventory/host_vars/db02.iad2.fedoraproject.org deleted file mode 100644 index 96d61906a5..0000000000 --- a/inventory/host_vars/db02.iad2.fedoraproject.org +++ /dev/null @@ -1,76 +0,0 @@ ---- -# -# We should narrow this down at some point -# -custom_rules: ['-A INPUT -p tcp -m tcp --dport 5432 -j ACCEPT'] -# This is a generic list, monitored by collectd -databases: - - anitya - - blockerbugs - - bodhi2 - - elections - - fedocal - - hyperkitty - - kerneltest - - koschei - - mailman - - mbs - - mirrormanager2 - - notifications - - odcs - - pagure - - pdc - - tahrir - - waiverdb - - transtats - - resultsdb - - zezere -datacenter: iad2 -db_backup_dir: ['/backups'] -# This is a more strict list of databases to backup every day -dbs_to_backup: - - anitya - - blockerbugs - - bodhi2 - - elections - - fedocal - - hyperkitty - - kerneltest - - koschei - - mailman - - mbs - - mirrormanager2 - - notifications - - odcs - - pagure - - pdc - - tahrir - - waiverdb - - transtats - - resultsdb - - zezere -# Should be 0.80 of memory -effective_cache_size: "50GB" -eth0_ipv4_gw: 10.3.163.254 -eth0_ipv4_ip: 10.3.163.114 -ks_repo: http://38.145.60.16/repo/rhel/RHEL9-x86_64/ -ks_url: http://38.145.60.16/repo/rhel/ks/kvm-rhel -# These are normally group variables, but in this case db servers are often different -lvm_size: 1500000 -max_cpu: "{{ num_cpus }}" -max_mem_size: "{{ mem_size * 2 }}" -max_stack_depth: "6MB" -max_worker_processes: 12 -mem_size: 65536 -nagios_Check_Services: - swap: false -nrpe_procs_crit: 900 -# -# db01 handles lots of apps, could have many procs if they are busy. -# -nrpe_procs_warn: 800 -num_cpus: 32 -# Should be 0.25 of memory -shared_buffers: "24GB" -vmhost: vmhost-x86-08.iad2.fedoraproject.org -volgroup: /dev/vg_guests diff --git a/inventory/inventory b/inventory/inventory index a197eac475..3d5b1b6c37 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -158,7 +158,6 @@ autosign01.stg.iad2.fedoraproject.org [dbserver] db01.iad2.fedoraproject.org -db02.iad2.fedoraproject.org db03.iad2.fedoraproject.org db-fas01.iad2.fedoraproject.org db-datanommer01.iad2.fedoraproject.org diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index eba9fc4792..9875669b43 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:db02.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-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" # 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:db02.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-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 user: root gather_facts: True diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml index d0a465ea6a..d159c208e0 100644 --- a/roles/postgresql_server/tasks/main.yml +++ b/roles/postgresql_server/tasks/main.yml @@ -13,7 +13,7 @@ state=enabled when: ansible_distribution_major_version|int == 8 -- name: on db-koji01 and db01.stg and db-fas01 enable the postgresql 15 module. +- name: on db-koji01 and db01.stg and db-fas01 and db01 enable the postgresql 15 module. copy: dest: /etc/dnf/modules.d/postgresql.module content: | @@ -22,7 +22,7 @@ stream=15 profiles= state=enabled - when: inventory_hostname.startswith(('db-koji01','db01.stg','db-fas01')) + when: inventory_hostname.startswith(('db-koji01','db01.stg','db-fas01','db01')) - name: install postgresql server packages (EL < 8) package: