Merge pull request #6117 from dimagi/dmr/replace-production-couch-node-2

Replace production couch node 2
dimagi · Oct 3, 2023 · 544ba73 · 544ba73
2 parents 3cbda6f + 1f06a37
commit 544ba73
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 28 deletions.
diff --git a/environments/production/aws-resources.yml b/environments/production/aws-resources.yml
@@ -14,8 +14,6 @@ couch11-production: 10.202.42.190
 couch11-production.instance_id: i-0aef627c2e6abe669
 couch12-production: 10.202.40.52
 couch12-production.instance_id: i-0e9aaeea3a117206e
-couch13-production: 10.202.40.154
-couch13-production.instance_id: i-00a287226e9555670
 couch_a0-production: 10.202.40.200
 couch_a0-production.instance_id: i-0451df80fe9da4eef
 couch_a1-production: 10.202.40.179

diff --git a/environments/production/inventory.ini b/environments/production/inventory.ini
@@ -380,8 +380,6 @@ elasticsearch_data=false
 10.202.42.190 hostname=couch11-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0aef627c2e6abe669 datavol_device=/dev/sdf datavol_device1=/dev/sdf is_datavol_ebsnvme=yes root_encryption_mode=aws
 [couch12]
 10.202.40.52 hostname=couch12-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0e9aaeea3a117206e datavol_device=/dev/sdf datavol_device1=/dev/sdf is_datavol_ebsnvme=yes root_encryption_mode=aws
-[couch13]
-10.202.40.154 hostname=couch13-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-00a287226e9555670 datavol_device=/dev/sdf datavol_device1=/dev/sdf is_datavol_ebsnvme=yes root_encryption_mode=aws
 
 [couch_a0]
 10.202.40.200 hostname=couch-a0-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-0451df80fe9da4eef datavol_device=/dev/sdf datavol_device1=/dev/sdf is_datavol_ebsnvme=yes root_encryption_mode=aws
@@ -393,7 +391,6 @@ elasticsearch_data=false
 [couchdb2:children]
 couch11
 couch12
-couch13
 couch_a0
 couch_a1
 couch_b0

diff --git a/environments/production/inventory.ini.j2 b/environments/production/inventory.ini.j2
@@ -233,7 +233,6 @@ elasticsearch_data=false
 
 {{ __couch11__ }}
 {{ __couch12__ }}
-{{ __couch13__ }}
 
 {{ __couch_a0__ }}
 {{ __couch_a1__ }}
@@ -242,7 +241,6 @@ elasticsearch_data=false
 [couchdb2:children]
 couch11
 couch12
-couch13
 couch_a0
 couch_a1
 couch_b0

diff --git a/environments/production/migrations/0009-move-to-3-jammy-nodes/couchdb-step-2.yml b/environments/production/migrations/0009-move-to-3-jammy-nodes/couchdb-step-2.yml
@@ -0,0 +1,2 @@
+target_allocation:
+  - couch11,couch_a0,couch_a1:3
diff --git a/environments/production/terraform.yml b/environments/production/terraform.yml
@@ -178,18 +178,6 @@ servers:
     group: "couchdb2"
     os: bionic
 
-  - server_name: "couch13-production"
-    server_instance_type: c6a.8xlarge
-    network_tier: "db-private"
-    az: "a"
-    volume_size: 90
-    volume_encrypted: yes
-    block_device:
-      volume_size: 3500
-      encrypted: yes
-    group: "couchdb2"
-    os: bionic
-
   - server_name: "couch_a0-production"
     server_instance_type: c6a.8xlarge
     network_tier: "db-private"
@@ -199,23 +187,18 @@ servers:
     block_device:
       volume_size: 3150
       encrypted: yes
-      ## Enable once migration is complete
-      # enable_cross_region_backup: yes
+      enable_cross_region_backup: yes
     group: "couchdb2"
     os: jammy
 
   - server_name: "couch_a1-production"
-    ## Increase once ready for migration
-    # server_instance_type: c6a.8xlarge
-    server_instance_type: c6a.large
+    server_instance_type: c6a.8xlarge
     network_tier: "db-private"
     az: "a"
     volume_size: 80
     volume_encrypted: yes
     block_device:
-      ## Increase once ready for migration
-      # volume_size: 3150
-      volume_size: 1
+      volume_size: 3150
       encrypted: yes
     group: "couchdb2"
     os: jammy
@@ -632,8 +615,8 @@ internal_albs:
     health_check_interval: 30
     targets:
       - couch11-production
-      - couch12-production
       - couch_a0-production
+      - couch_a1-production
 
 elasticache_cluster:
   create: yes
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		target_allocation:
		- couch11,couch_a0,couch_a1:3