Merge pull request #6141 from pvisweswar/SAAS-14985/remove_pgbouncer_…

…c1_production removing pgbouncer_c1 from production environment
dimagi · Oct 10, 2023 · 40044cb · 40044cb
2 parents 17bc544 + ca4f31e
commit 40044cb
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 34 deletions.
diff --git a/environments/production/aws-resources.yml b/environments/production/aws-resources.yml
@@ -97,8 +97,6 @@ pgbouncer_b2-production: 10.202.41.209
 pgbouncer_b2-production.instance_id: i-0401d2bda17749fb5
 pgbouncer_b3-production: 10.202.41.227
 pgbouncer_b3-production.instance_id: i-06b0e8333a5597559
-pgbouncer_c1-production: 10.202.42.16
-pgbouncer_c1-production.instance_id: i-079250a517f8cf507
 pgformplayer2-production: pgformplayer2-production.cl9dmuo3ok4h.us-east-1.rds.amazonaws.com
 pgformplayer_nlb-production: pgformplayer-nlb-production-ec7390b942368541.elb.us-east-1.amazonaws.com
 pgmain1-production: pgmain1-production.cl9dmuo3ok4h.us-east-1.rds.amazonaws.com

diff --git a/environments/production/inventory.ini b/environments/production/inventory.ini
@@ -70,8 +70,6 @@ mobile_webworkers
 10.202.41.209 hostname=pgbouncer-b2-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0401d2bda17749fb5 root_encryption_mode=aws pgbouncer_processes=2
 [pgbouncer_b3]
 10.202.41.227 hostname=pgbouncer-b3-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-06b0e8333a5597559 root_encryption_mode=aws pgbouncer_processes=2
-[pgbouncer_c1]
-10.202.42.16 hostname=pgbouncer-c1-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-079250a517f8cf507 root_encryption_mode=aws pgbouncer_processes=2
 [pgbouncer13]
 10.202.40.97 hostname=pgbouncer13-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-00081ab490dce797c root_encryption_mode=aws pgbouncer_processes=2
 [pgbouncer14]
@@ -147,7 +145,6 @@ pgbouncer_a5
 pgbouncer_a6
 pgbouncer_b2
 pgbouncer_b3
-pgbouncer_c1
 pgbouncer13
 pgbouncer14
 pgformplayer_nlb

diff --git a/environments/production/inventory.ini.j2 b/environments/production/inventory.ini.j2
@@ -33,7 +33,6 @@ mobile_webworkers
 {{ __pgbouncer_a6__ }} pgbouncer_processes=2
 {{ __pgbouncer_b2__ }} pgbouncer_processes=2
 {{ __pgbouncer_b3__ }} pgbouncer_processes=2
-{{ __pgbouncer_c1__ }} pgbouncer_processes=2
 {{ __pgbouncer13__ }} pgbouncer_processes=2
 {{ __pgbouncer14__ }} pgbouncer_processes=2
 
@@ -91,7 +90,6 @@ pgbouncer_a5
 pgbouncer_a6
 pgbouncer_b2
 pgbouncer_b3
-pgbouncer_c1
 pgbouncer13
 pgbouncer14
 pgformplayer_nlb

diff --git a/environments/production/known_hosts b/environments/production/known_hosts
@@ -106,9 +106,6 @@
 10.202.40.151 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBATjdB9Vh+gKl5Cv5Nz3LcV30/uKydsA42PYByKO9zgUoB4nNFH0+7BaHPCex58Tc0u4wBvGfNZX3HtLQxUXONg=
 10.202.40.151 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIEQSBCCwyE49oIVQDz28COYttk1b7tWLdRsRcevUKW/
 10.202.40.151 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDCzwSzy3cYLNVxAndPm2VwUExyuvRIO73rZP9UIrHjMzbFnI9aiqHeV9aYL24JiGdqPExjNaDGgofy0DeCEIZxYqjXuiKTIz9RFHG5s9ltgTJH8w44iTSV1re+iWgGNs1PiWySCPYJSPr+lA/WVP4dDLqJaRgvWix69EglwtaSOrVSXBESC4x/wFAN6EabObXaBPKB+lffrIOwtdJ7w1tVK0zEisoMyaQScIr6WueHHPnlzCSD0EnWAQaE12u3rnogGzzWnlNQ5DQRBM3JPJ0l18K+3jk1lCpYRk/ck14witzyfjLPEljAqwtT/H1vCDlnLVtxOL3kQY5p2x4gOKmdoQ4ZKGchivswvNZHxVfHRQx3Zw27duKW9fu5mlbA9nUwPAJ/PodoMaHx2b1zIAsFKcn13XVRmzyyB4vZCCnKNQFBCV0eSBl6CCVCAmHf92KTMpWebx+/lXSFBGlDuTKW7TY2If5vIPS0hYJ3RlHzWT6rjqEDPuWoWjMw0Egw3Ms=
-10.202.40.154 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNJtotJTt6mDDJIqd0vxTDn6FxSRYFQDOMIl1nIR7iyDDIZTCiAxyMPoPZwsEQcqYguOPLOzHCQCyjtDpMYOSbg=
-10.202.40.154 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINvqck9AKN25qKSlAzvpaXyWkgTsVKenYQUjFZghg+jM
-10.202.40.154 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqGfeEWjECfhqqN3qVpkWrXZu2/Bm3aiJBby5O+fcz8QJftVNX+XJEBBE2twRib7LGhy7Kgq78TlsT5ImLcyEfTnvzWjUv5ga4E3eAGqGTInyRpGSU6oUnnDeYjf5zDglS3/NWpitEM5F/4H7pw82Mrb9tNo0712Oj04o99alquG39Hz9a36Kn8EnAHgxHx0gOc3Xr3Q3Cs61U8Hydfx69OdSKBdh7HMxeq6VvdFOMj+OlLPgzoQMHF8TYh/jNSItl4iavWn52DRurqQ2HoCamexBx9RFw19duWr45eZb4kWz/F/sumnQALXbz0FjUZnAFkO50HNHLOtDZYWgf0SPv
 10.202.40.159 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOWluBeiI/XvL58hztk05QET5ModGayYPflgvfp/M+MurSWSIuFAU+tjXQtM719JVa8kotEMkPtjcRpEGxbaSDs=
 10.202.40.159 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKGAto608Ct/ahoZROhoy/O1MIQdChEeqsrnUr0BiTox
 10.202.40.159 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLHhcm5WU0HVicZtD5KVklsOFHXGS7ipjZrCo129c7vkuHRdHoAnsJTCiPopG0u1HwfIqhL3wb9VkJpA8fm2OeOeLVXR7jQg7uq9nFiw0RAJ39P6gtVy790hZ1ihbCoAlZvCgapS6az9uNP3UHtv6ziMJL+CzULNSCgrz6o9ZVRb+NDU9/xTeKKuRov+diIC4eJqeN4z4SUi4JMyZGOhisKHxx+GbfgZtbGEb9sqI0nuGejzabemEzfke14ZXE6Gd968dP9qK/glFydjB78NWh/0hrX9w8kdMBVKQky5aJxOlv864ptB/n3znzbcuIhgLlLpTyM3Rleer2Vc8kn6U3jqsKfqa/B3Bf0StQlD5RC2d9XJl4wxqbIUsrBIkaK9CBOB3Mu8bsQI9fKaGDAyQVDoFceKt3B4esxCiEoCvh+uylvc7MJasjrOidwmBUkmTPusExumosNgKawwH/q7uECGm5a5S3j3zB8q06U1DkOxSlojsMWMJ3s6e3eubOrCc=
@@ -184,9 +181,6 @@
 10.202.42.126 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB9+Yop+dtNEEkVUz33ORQRYQBVDrpJuvKymyh4kRZ6cdpPgrS3fLImqPP4UWQn1MPgxSD6mvh+ZP2cfvC1FoVg=
 10.202.42.126 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ1v9AxK2sM7TG8LQICtaNkPio6If8TgXEVNnMsTEHbU
 10.202.42.126 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCT9ef8OCFyqayFSCXubabmEp+hitsmcjH3pTNFAsbYbQ9xyh+I3iVrNf2BA9ImcDZ/tSjvm6TRPUwMHtaJy6v49ASa0bnkiLRPJLhMmqn8KVaCRxQO9N/34/MUZ2crlCc6TaB8OpO6NPuAk9H6/Nvj8YhGlWZ1mSmY0fd/vefMyqhIrHn7GXkyPuoPu76rIE/A4aLq17IvznqGs9FYZARdIdtoM2j5LJJz+wh3j8lhqbeh43i99hU1F4HBRNEpq5T62DO+cghfi3CndN9vkZ3Q8paTom3r2YvrjlmrS9Y8aw36CM9cDFiLTxLUQMIx7DdSRu5rsmVyLaBwRNwgWl/U+TNL+7dTdvfbiHFJOBACRidQ0JZAOj/Db+ipHONkfJCKxKBoNy+EIdUqnP79veydB+d09HIhS6Q6GwKh1jYB3aG/RTPYMopxyRW3STTmexmAQZMeFRDUfy9okFkDD+sI+rv6OpeBzuIpOwmlj+U/zdtmuxeK2ElbBmonTK9KdZc=
-10.202.42.16 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMRExL5EpzSddaAo4Vuh/mQN4HzsBxuEQYMd+L08GHs2iXD8SOkfBVLv8MZ7he7wCYTDj5hGhcnv3ytCirN8vWk=
-10.202.42.16 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ94dFcnHhb507zb2A3OSLLFrek4ZWo0uXUqDW0zJ4aY
-10.202.42.16 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDYoSp1WpELMkt4ooRpVh/TaXUbOtM36lSMd63IJFDMaQABOyd+n3CCYXxLgUFjNsNrbED49RUPntlmCJ7XF3lM+QOZCjeuIhLnM1EXn5fRCp3i5iew7YuhRwEOeQGZJP5DNczZOZrJEit5kKH5zXml/ti5vEQacisjlDh2M90NB0P5JgLzJxu3QIfTZU7q9JtLl2g/zlouDv+DFg9q08outFT7sXpQnweqjwq+iPIioDCiieemhgcFqdEehSX/rURfdmbjESvws5oQX07WgaYC0NTV5XxroeMEuqwIXNjNSw86MEl47zypihUWoTDAp0B2IusqErKK75j4GR5d6HZ72w/8p/DxAo8iW9WKYMvrmH/1kDysAyLTUK+BJ0FxMO0Ncpy7Vj0n9XKpGQxdBBswL+HF0L1jTTmVY00eIHgtlwa/OfkA/ZKYvpwy6clU/hQp8PmanYuO6ze7qrJOGIz7KvUKLBXENy8ys5Ov/sXTmludvLpAYmWxU8kkVPSlcYs=
 10.202.42.190 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP8NNu4YpoTENHSt5npibs9ARLKbRXgCxr2IcBmLmgMGrRm00VPKBmGuieAU+W7vuvhMQNjpJzkC41BXksh1PwM=
 10.202.42.190 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKW7J4FJb7XanEX6LhSCUa5plQ9SjynaI2abGOadQVaJ
 10.202.42.190 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0nYdEfLLNx829XLRL8XbQtleUAvqcyVkyK/kxvJfCsJPGN056vFWSwsICmXmtR2ZPRNg0GEQ2k+lGAtI8vhpOoVftD61dJjt2RCyY0UlxNXg4Kn9n0EbBnBxbcgpOeDAaUfBPIwnNLa91VXgxHzzn/sKqLT71go8pmKZTzu2aWS6Z4iTp/RISDD7jBTs0zIsTWSzlDRyY9lbGkeqiogbVpwmqai+0YUc/JxOH3svdSyxAxZvwAiQbyohZrKpVc/iVcgRv83bUdf1ZfqMI9jmfEoDVWC0SPvuWSYcG6G01Sfb6gMP6mSzBt3RDuYl5VEdePx6wlhZhSimgQKEK7mPT

diff --git a/environments/production/postgresql.yml b/environments/production/postgresql.yml
@@ -48,7 +48,6 @@ dbs:
       - pgbouncer_a5
       - pgbouncer_b2
       - pgbouncer_b3
-      - pgbouncer_c1
       - pgbouncer13
       - pgbouncer14
   formplayer:
@@ -60,7 +59,6 @@ dbs:
       - pgbouncer_a5
       - pgbouncer_b2
       - pgbouncer_b3
-      - pgbouncer_c1
       - pgbouncer13
       - pgbouncer14
   ucr:
@@ -73,7 +71,6 @@ dbs:
       - pgbouncer_a5
       - pgbouncer_b2
       - pgbouncer_b3
-      - pgbouncer_c1
       - pgbouncer13
       - pgbouncer14
     query_stats: True
@@ -85,7 +82,6 @@ dbs:
       - pgbouncer_a5
       - pgbouncer_b2
       - pgbouncer_b3
-      - pgbouncer_c1
       - pgbouncer13
       - pgbouncer14
   auditcare:
@@ -98,7 +94,6 @@ dbs:
       - pgbouncer_a5
       - pgbouncer_b2
       - pgbouncer_b3
-      - pgbouncer_c1
       - pgbouncer13
       - pgbouncer14
   repeaters:
@@ -111,7 +106,6 @@ dbs:
       - pgbouncer_a5
       - pgbouncer_b2
       - pgbouncer_b3
-      - pgbouncer_c1
       - pgbouncer13
       - pgbouncer14
   form_processing:
@@ -130,7 +124,6 @@ dbs:
           - pgbouncer_a5
           - pgbouncer_b2
           - pgbouncer_b3
-          - pgbouncer_c1
           - pgbouncer13
           - pgbouncer14
       p2:
@@ -142,7 +135,6 @@ dbs:
           - pgbouncer_a5
           - pgbouncer_b2
           - pgbouncer_b3
-          - pgbouncer_c1
           - pgbouncer13
           - pgbouncer14
       p3:
@@ -154,7 +146,6 @@ dbs:
           - pgbouncer_a5
           - pgbouncer_b2
           - pgbouncer_b3
-          - pgbouncer_c1
           - pgbouncer13
           - pgbouncer14
       p4:
@@ -166,7 +157,6 @@ dbs:
           - pgbouncer_a5
           - pgbouncer_b2
           - pgbouncer_b3
-          - pgbouncer_c1
           - pgbouncer13
           - pgbouncer14
       p5:
@@ -178,6 +168,5 @@ dbs:
           - pgbouncer_a5
           - pgbouncer_b2
           - pgbouncer_b3
-          - pgbouncer_c1
           - pgbouncer13
           - pgbouncer14
diff --git a/environments/production/terraform.yml b/environments/production/terraform.yml
@@ -366,14 +366,6 @@ servers:
     volume_encrypted: yes
     group: "postgresql"
     os: jammy
-  - server_name: "pgbouncer_c1-production"  # pgbouncer_host for pgmain, formplayer
-    server_instance_type: t3a.large
-    network_tier: "db-private"
-    az: "c"
-    volume_size: 80
-    volume_encrypted: yes
-    group: "postgresql"
-    os: jammy
   - server_name: "pgbouncer13-production" # pgbouncer_host for ucr dbs
     server_instance_type: t3a.large
     network_tier: "db-private"
@@ -592,12 +584,10 @@ pgbouncer_nlbs:
     targets:
       - pgbouncer_a4-production
       - pgbouncer_b2-production
-      - pgbouncer_c1-production
   - name: pgmain_nlb-production
     targets:
       - pgbouncer_a4-production
       - pgbouncer_b2-production
-      - pgbouncer_c1-production
   - name: pgucr_nlb-production
     targets:
       - pgbouncer13-production