Merge pull request #6058 from pvisweswar/SAAS-14750/Change_instance_t…

…ype_of_mobile_webworkers Change instance type of production Mobile Webworkers to m6a.2xlarge
dimagi · Jul 26, 2023 · 279dfad · 279dfad
2 parents 9682e9e + 6942d8b
commit 279dfad
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 45 deletions.
diff --git a/environments/production/aws-resources.yml b/environments/production/aws-resources.yml
@@ -165,17 +165,7 @@ web_m_a2000-production: 10.202.10.110
 web_m_a2000-production.instance_id: i-0e722c5dbf34973c3
 web_m_a2001-production: 10.202.10.73
 web_m_a2001-production.instance_id: i-0da305f1242acf727
-web_m_a2002-production: 10.202.10.236
-web_m_a2002-production.instance_id: i-0608f0a2beb9d824b
 web_m_b2000-production: 10.202.11.46
 web_m_b2000-production.instance_id: i-06645cf5c304c7e92
 web_m_b2001-production: 10.202.11.57
 web_m_b2001-production.instance_id: i-01fcff38c2c7452e3
-web_m_b2002-production: 10.202.11.204
-web_m_b2002-production.instance_id: i-0fa580f6421fa3e90
-web_m_c2000-production: 10.202.12.91
-web_m_c2000-production.instance_id: i-031ca66f1ee40093f
-web_m_c2001-production: 10.202.12.241
-web_m_c2001-production.instance_id: i-0a947a86303107aab
-web_m_c2002-production: 10.202.12.171
-web_m_c2002-production.instance_id: i-06babe886e0bd228e
diff --git a/environments/production/inventory.ini b/environments/production/inventory.ini
@@ -62,34 +62,17 @@ web_c2004
 10.202.10.110 hostname=web-m-a2000-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0e722c5dbf34973c3 root_encryption_mode=aws
 [web_m_a2001]
 10.202.10.73 hostname=web-m-a2001-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0da305f1242acf727 root_encryption_mode=aws
-[web_m_a2002]
-10.202.10.236 hostname=web-m-a2002-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0608f0a2beb9d824b root_encryption_mode=aws
 [web_m_a2:children]
 web_m_a2000
 web_m_a2001
-web_m_a2002
 
 [web_m_b2000]
 10.202.11.46 hostname=web-m-b2000-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-06645cf5c304c7e92 root_encryption_mode=aws
 [web_m_b2001]
 10.202.11.57 hostname=web-m-b2001-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-01fcff38c2c7452e3 root_encryption_mode=aws
-[web_m_b2002]
-10.202.11.204 hostname=web-m-b2002-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0fa580f6421fa3e90 root_encryption_mode=aws
 [web_m_b2:children]
 web_m_b2000
 web_m_b2001
-web_m_b2002
-
-[web_m_c2000]
-10.202.12.91 hostname=web-m-c2000-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-031ca66f1ee40093f root_encryption_mode=aws
-[web_m_c2001]
-10.202.12.241 hostname=web-m-c2001-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0a947a86303107aab root_encryption_mode=aws
-[web_m_c2002]
-10.202.12.171 hostname=web-m-c2002-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-06babe886e0bd228e root_encryption_mode=aws
-[web_m_c2:children]
-web_m_c2000
-web_m_c2001
-web_m_c2002
 
 [logproxy:children]
 proxy
@@ -102,7 +85,6 @@ web_c2
 [mobile_webworkers:children]
 web_m_a2
 web_m_b2
-web_m_c2
 
 [webworkers:children]
 hq_webworkers

diff --git a/environments/production/inventory.ini.j2 b/environments/production/inventory.ini.j2
@@ -15,8 +15,6 @@ proxy_b3
 
 {{ __web_m_b2__ }}
 
-{{ __web_m_c2__ }}
-
 [logproxy:children]
 proxy
 
@@ -28,7 +26,6 @@ web_c2
 [mobile_webworkers:children]
 web_m_a2
 web_m_b2
-web_m_c2
 
 [webworkers:children]
 hq_webworkers

diff --git a/environments/production/terraform.yml b/environments/production/terraform.yml
@@ -77,33 +77,23 @@ servers:
     server_auto_recovery: true
 
   - server_name: "web_m_a2{i}-production"
-    server_instance_type: m6a.xlarge
+    server_instance_type: m6a.2xlarge
     network_tier: "app-private"
     az: "a"
     volume_size: 40
     group: "mobile_webworkers"
     os: jammy
-    count: 3
+    count: 2
     server_auto_recovery: true
 
   - server_name: "web_m_b2{i}-production"
-    server_instance_type: m6a.xlarge
+    server_instance_type: m6a.2xlarge
     network_tier: "app-private"
     az: "b"
     volume_size: 40
     group: "mobile_webworkers"
     os: jammy
-    count: 3
-    server_auto_recovery: true
-
-  - server_name: "web_m_c2{i}-production"
-    server_instance_type: m6a.xlarge
-    network_tier: "app-private"
-    az: "c"
-    volume_size: 40
-    group: "mobile_webworkers"
-    os: jammy
-    count: 3
+    count: 2
     server_auto_recovery: true
 
   - server_name: "esmaster_a1-production"