From decf2d3dac40c646e49bc6989f43b099307582e1 Mon Sep 17 00:00:00 2001 From: Daniel Roberts Date: Wed, 6 Sep 2023 17:50:59 -0500 Subject: [PATCH 1/2] Remove couch12-production --- environments/production/aws-resources.yml | 2 -- environments/production/inventory.ini | 3 --- environments/production/inventory.ini.j2 | 2 -- environments/production/terraform.yml | 13 ------------- 4 files changed, 20 deletions(-) diff --git a/environments/production/aws-resources.yml b/environments/production/aws-resources.yml index ecebccbe2e..7d39f8023b 100644 --- a/environments/production/aws-resources.yml +++ b/environments/production/aws-resources.yml @@ -12,8 +12,6 @@ control4-production: 10.202.10.11 control4-production.instance_id: i-05a9ed9fd13fabd55 couch11-production: 10.202.42.190 couch11-production.instance_id: i-0aef627c2e6abe669 -couch12-production: 10.202.40.52 -couch12-production.instance_id: i-0e9aaeea3a117206e 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 index 24e46353fd..22a607a014 100644 --- a/environments/production/inventory.ini +++ b/environments/production/inventory.ini @@ -378,8 +378,6 @@ elasticsearch_data=false [couch11] 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 [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 @@ -390,7 +388,6 @@ elasticsearch_data=false [couchdb2:children] couch11 -couch12 couch_a0 couch_a1 couch_b0 diff --git a/environments/production/inventory.ini.j2 b/environments/production/inventory.ini.j2 index 55faeca230..d5c65952af 100644 --- a/environments/production/inventory.ini.j2 +++ b/environments/production/inventory.ini.j2 @@ -232,7 +232,6 @@ elasticsearch_master=false elasticsearch_data=false {{ __couch11__ }} -{{ __couch12__ }} {{ __couch_a0__ }} {{ __couch_a1__ }} @@ -240,7 +239,6 @@ elasticsearch_data=false [couchdb2:children] couch11 -couch12 couch_a0 couch_a1 couch_b0 diff --git a/environments/production/terraform.yml b/environments/production/terraform.yml index f1f2b9788e..b1f05cbc03 100644 --- a/environments/production/terraform.yml +++ b/environments/production/terraform.yml @@ -165,19 +165,6 @@ servers: group: "couchdb2" os: bionic - - server_name: "couch12-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 - enable_cross_region_backup: yes - group: "couchdb2" - os: bionic - - server_name: "couch_a0-production" server_instance_type: c6a.8xlarge network_tier: "db-private" From daf81f390c37ff5c6c22fd7c3a399d230aa0e02e Mon Sep 17 00:00:00 2001 From: Daniel Roberts Date: Wed, 6 Sep 2023 17:31:39 -0500 Subject: [PATCH 2/2] Replace production couch node 3 --- .../0009-move-to-3-jammy-nodes/couchdb-step-3.yml | 2 ++ environments/production/terraform.yml | 10 +++------- 2 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 environments/production/migrations/0009-move-to-3-jammy-nodes/couchdb-step-3.yml diff --git a/environments/production/migrations/0009-move-to-3-jammy-nodes/couchdb-step-3.yml b/environments/production/migrations/0009-move-to-3-jammy-nodes/couchdb-step-3.yml new file mode 100644 index 0000000000..65da481e79 --- /dev/null +++ b/environments/production/migrations/0009-move-to-3-jammy-nodes/couchdb-step-3.yml @@ -0,0 +1,2 @@ +target_allocation: + - couch_a0,couch_a1,couch_b0:3 diff --git a/environments/production/terraform.yml b/environments/production/terraform.yml index b1f05cbc03..fd121defba 100644 --- a/environments/production/terraform.yml +++ b/environments/production/terraform.yml @@ -191,17 +191,13 @@ servers: os: jammy - server_name: "couch_b0-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: "b" 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 @@ -601,9 +597,9 @@ internal_albs: target_port: 15984 health_check_interval: 30 targets: - - couch11-production - couch_a0-production - couch_a1-production + - couch_b0-production elasticache_cluster: create: yes