Merge pull request #6108 from dimagi/dmr/add-placeholder-couchdb-nodes

Add placeholder couchdb nodes to production that we can enlarge when ready

environments/production/aws-resources.yml

@@ -16,7 +16,13 @@ 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
+couch_a1-production.instance_id: i-04b77afb7b43ddf16
 couch_alb-production: internal-couch-alb-production-4251727.us-east-1.elb.amazonaws.com
+couch_b0-production: 10.202.41.204
+couch_b0-production.instance_id: i-03f70dc45f928a0a7
 djangomanage_a1-production: 10.202.10.13
 djangomanage_a1-production.instance_id: i-05287a83c6f4dfc10
 efs_production-efs: fs-99495a6e.efs.us-east-1.amazonaws.com

environments/production/inventory.ini

@@ -383,10 +383,20 @@ elasticsearch_data=false
 [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
+[couch_a1]
+10.202.40.179 hostname=couch-a1-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-04b77afb7b43ddf16 datavol_device=/dev/sdf datavol_device1=/dev/sdf is_datavol_ebsnvme=yes root_encryption_mode=aws
+[couch_b0]
+10.202.41.204 hostname=couch-b0-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-03f70dc45f928a0a7 datavol_device=/dev/sdf datavol_device1=/dev/sdf is_datavol_ebsnvme=yes root_encryption_mode=aws
+
 [couchdb2:children]
 couch11
 couch12
 couch13
+couch_a0
+couch_a1
+couch_b0
 
 [couchdb2:vars]
 swap_size=2G

environments/production/inventory.ini.j2

@@ -235,10 +235,17 @@ elasticsearch_data=false
 {{ __couch12__ }}
 {{ __couch13__ }}
 
+{{ __couch_a0__ }}
+{{ __couch_a1__ }}
+{{ __couch_b0__ }}
+
 [couchdb2:children]
 couch11
 couch12
 couch13
+couch_a0
+couch_a1
+couch_b0
 
 [couchdb2:vars]
 swap_size=2G

environments/production/known_hosts

@@ -115,6 +115,12 @@
 10.202.40.165 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBYwUDCdRTm9Gpd8ZqqNz7v89ga9QahlXUMsSMu7vuWOI0aTXytlCANyxt/r9d+CdQdH8OWm+oe4KVgJ8mQZIsk=
 10.202.40.165 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBfexSZT2uElAVWCS995lwica3xoOi3OKEoOppbAmpUx
 10.202.40.165 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQClAgwxHJZ11q13N7hxP6i7CR5veFZICiqseDyM2bnHQjASCCdJJo1dxF/lVns6ktVFH3WajZPMdC1EbxVaVmx0vYsaj6K+OJSX5tu/Vdq/uK41qOBxqtz5T+SqnnANiG+YoIR6uOohBQJ6pqxSoN3YVypM7bpQ1JqoBgMlZLqWP3uabaXor5fNvqZZMWvE8fbws4KiLHZGVpSC0lNjp+P9QwC6GuAUqGZZJdJ6LC8ljt9Qkcs1vLDfKk+P8x7O7lxXTuyUyZAPg9OZABMVEv4yw0fgugySXjBpAWDaUMHvZ2sYZic2ZoaSqQ3SofBQCkYboYTGPJLh0tt9AUZwnSKBDztznEUGNUVs7OkrILRK9FbSvjLJQzsEiU3M3KJ+THddrynlpq/L6yiieKl32RBfw0lTwrpadMGbhWT2NqBHdBBtA5ictl9ZGWt842trG7TKvdX1+SwsGfGndBZP0/EGYEczHOGYedoMRMjCVrboQf1pUzxaj1IZoN0bepfjXB8=
+10.202.40.179 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEeHcNOwYnPleo4iL70M/7Xf0dOOGux5bwprfzmDTghMLFN2yPy6hcp3QmKpnbrQze6wj+XvBcluWOKvf6T4zHk=
+10.202.40.179 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINmAeuv25kcocIHKftdX9CndPj6gOE+fh9Lj27cTBKVG
+10.202.40.179 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCH+Y5YQZshWi8FETNDhACoVT1zp5Ebvj7ZEnxSWzdahVh9Or9z1wXt5IDYwlGT7/xvwo6QgvF80NkKQhqsxEy3QmXpNlPFIkGKyUCg6mozH0KEi/iAlxQKgTuFVCAI7VHpxmRmtrFjPBV4BKcLAkCJ/vDyqJRT6fXSd1g7YovLx2ohzdCI3t7hABa9wemRLSAn8TSSKz7lR+MxyJjqE6mxO0S6iW04EsVKZkNOPNXpPRewmRog4xCsfZRDjgn9oqBgd44VZRrafaaSft3wAZSCLXy49S1ySMx3k1aneZ1cnyNS4nDZJB0DiN6BNKUBE1X2JdDOqfeihdc/aqExHf2A8dw85RFMCZR2CkA/IzRs8VUDVw5ZsQhJ4FPjAZ0WZqr9e2NINwy7g+JX0q6syU0UlJHNoqmPZaK4xbm6ITjN0CfC/q8/GGHsqbn9toAjAdOcdm9p8jg85p0DlFjQxnIc6wMhPj9aeTUa3FMVN/0hJMSmYxHT5aLJjR+Y8whwPEc=
+10.202.40.200 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBO2xKfZr3rgFBh73Pd5/V3lEit0hl0q5uCiLVWq0YUWd6SR1FrrvzJTDXKrGrkb/4X1hJDXQkVSFofweX84tHU4=
+10.202.40.200 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII5j/LmtNGv4uYAwRuN87EVRJHfpf3pnPPf8lNTDxcjg
+10.202.40.200 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGv6iJV9oi67jAkKndgIGPYZXPvOCXI+VoQFvBxJFD9OQEy4Z9shT2i0pGLCpe7P3I2ykcqHTFfmlda01qEnkcJYNnHO6pF+FJaMqiEqOl4apVLZWGENvy18p17CRnyhJIgmlLV/9+hl/RgOIqM5fs4SkQpJDQO5GkhLlXOyGfc19o4d7AWSLz9YqsWol+JNvknOcNPWQzk8qwAgmxdZZZtyZqaVE2Fw59hhNKY1dMVkPHbM8Y8CHcdtBnZeO99dyVNEClLvx7vON4S/ywMIDVeYoh9FZmib5J4M7ZMtgsarOmo3e9jz+FFoeHfPN220E4wLdavQbx8MDigQ/i9DDMSmuTzjJxYe2PHwv3Y4SsGDzO5FOsYwrc5TejgvLtr+IhWeU2eiAwJ0VjJ0JOUe7cCl9QSlKGDOdtCWh6j4vAFk/c8T2pm3xqsNA97tbb94Wb0ywljpJU3xHEtuSegWbPaaY2kfnaGiJmznwa6I3FDssTYS0alaUDUZT+ipG0Rl8=
 10.202.40.227 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMVHOGy/wrrKBNEyayMhSV1tRtpocxHDGBXk10xv+zoOMlzwN4rv7N5f6ebY/erQYxBybC7IG9qhBo9g9svJ4=
 10.202.40.227 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICrNTTu0uZGgTSrv2EabCdo/DZRmhzaHq2KFQaGaUxcT
 10.202.40.227 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFS1U6E5KFBK7Xoq8gsr0VlwVgrWJRKa2v6Dv3VnFjyDejQdSjM5XKhMfakU+eQQuFE3MB1wkZq4RLuvNBs72+IGL4gxVXeIAddMw/iaUVJx/AQPip/VQ2V+RyRaGOExDNKjtBRcxoj8Elf2BUO35PkBJ/LmkAjoC/fApX+WcUA+VHouppRa6+NABvGXg0Mz/XxyLLsB3YD2fvL5wMTQ5hmV9iULqn57b7WvJVqTvYjSPfYgDp+LEGmR3aYQI0v1VT5+Y+EAoRPs2AD40vUEeNhc5yPu3U78+mqnTs8lwlykgZbpUqYh8+VbDX8QcnKunfOLAz835UniKrHMn4YpaB3QmjT5//3hCKj1/TF+1x0vI9NaOr2F2LXDkAnOc+dY8vov20QN5R1LcpYMkITuLU0WLYo5mUpeDQokdcOnW4R4gTFQl1aiRypmrHptd+iHHUrG0Ch+zO7g9ZLMenF0ILKPy5Fk54Fi1gUwGxOAKTxBadnPUvLtx9Pleqrglo9Ts=
@@ -145,6 +151,9 @@
 10.202.41.187 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJsCrkBiavyLw/LXZ+bmVLZbo38K3haXeDBvjpxpbpLjebuJ2OwP67fYohuzFOKylLbZEkRAcQ5/dzeOdckUOn0=
 10.202.41.187 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFstCLqKsfhI2pL5Hs+jmYfLhiHQZ0r706x3UH+BCIUj
 10.202.41.187 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC8TKDJisTuBfhG4YQ7CrMkGACm+2mvXXHqNrqJw78TJ7keavn+rSPUC/+MSdAZK2hGCf57EyY5D3Uvxr3A2gOn5LZ1q84SH8rELR0BCR3RS6L+d6/ZBBoXUUjInwRouKRqA4q1c5sk2mc5Cnf/4vFaCMZKG72zr3lLAVn+lBiHPTbzGbUZFKoR/xcNBsnXogPuSGfQqmdeyzmiGjYwXEJRz+TsmHymSBtc+MluxFtprm4yVvnJcdTKs3Xy9zJlYKLj5V41QJIVPJnQ7jRZ/EB6wcoYG+bFTgXotJ4gtQWjuIyuZ5LnRCjcjw6gDcTXoHeMw4OzIlWiggnCBKRnNQd25BetaVR7+XTe+pItlhE6aSyOiSVAhUcHermsf19lARguafFctiQ4tcqymuRYWoshCTw5YB2i31mCuFlnjQG3QbCOEfVdfeHoLw4E7v+/+/Ek4YCOEMuRDqSSkUxlxUP0UT9yuQ+zIeh6dYge4NE6u4HbJmJR1Vv1oWcC0s6irl0=
+10.202.41.204 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIPLUwVJJCuQyGpqlQ+DBaktJ0Sx7ssIwjDn2tqUh0zgCQmBlgiko1mRrOg5J6Qj30q9kFK3gZEZTOw6iUjquXA=
+10.202.41.204 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIASW+q6t8tB9c41qlrwxWJ59RZOUN0ChLklW7aXS4yBD
+10.202.41.204 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCRr2QZ8zwC1vgGAt/UrcpK5BcBIeDxjNYuyGzyWkcPabWk8c+Q1VCczrfNwcePwBa3qTFF5ZsXWUWLeiUI5Coy4XmzjRzbx2dTU9rH06xtcUuIFJvTjxRxFj0X43ttk7VvuYDU+CbHj6OzIhnE3GSdavJ/oEiyjEdnW5GrVL0MIvd2ULkidBfZpNYwwCIZ0PzPhqlCek1MDdPAjxuD5OjyVVWqDemU5/DcNODz/dQz7mfiod7oyfWSKsJj1Eq4dd12IhBH1SOAYTJ608cr4UUebIkTBewkKiMm2IhD2NuhsXEe4c08J9JTOr7PqWriEFdR8N0NHYhxym6ywCxj3imjMi6bNqI2J/C3vG7UnjFaddsQhY6X0VfOwElGVoWj9QTB/8fd7qHJJP3wUehGWOCBRXTNzkYU9PYI/IOskob9MTbC2cP9jSXYZn2HJss0nkDAahlmIRpVisoopmVdbGLrNERsLQqUL7M3LiC9/sqW2s6pukJ2DyAsSTLd5i3Ownc=
 10.202.41.209 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCN9lmyQACPsrDEVT96s0U55jcB7BQe9OCC0tf3b+SI97vH4O/wN1m9euzfH4Qu4Qpwn+7X0KhSiW8L6/kqS38k=
 10.202.41.209 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIhkTaeo4zV4TfAE1MOqpVJczbHGlbZ+EEhklcDSUpfP
 10.202.41.209 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDepAdAdOR3SFo70aLbdvZ7U8eVfqRZV/Jc3tC55HT3dPyMvseNCA7Qt3BjcjvEazuDvSJ7QL2elY86cPFyUwd1UEbvN7NwIyEnm9moszABtrfaKUOrO+GCe2UmSGcz4GhG0ptwUle8foBNyJd8wAsWB/fm9XaC6yXdPN0zBuSb7fVKzOUK646eVDDTFA6s5YwCRo5I9XbZ8o7i1RALsbbIcT/YAV0gG2WqcSW13PiYcy1WEH6eTLxPrgz7t44FTErGSNqIg/tZLxSvPiK50TuvspxHV31lUgrk4IGMe797La0qfVXunJ+F9s4kfOQwM/yauHboxfTHSuGdrst56f4n3o4XnEHhPcP9MzQk8vVQtfSD2YRSUx8DIVSSIRT0FmbJF+aL5878OGTm4vgASBnm3djYqjVhTS0dCujTc8Z7YLzCrJmCePVTeU/Vft3r4JZziCxMDP1DHs4h3KPJNRld5oxjwKKRqrL4n+0+az0BWmVKruPAlUfhul5XAn2Wrss=

environments/production/public.yml

@@ -94,7 +94,7 @@ couchdb2:
 couchdb_compaction_settings:
   _default: '[{db_fragmentation, "50%"}, {view_fragmentation, "50%"}, {from, "22:00"}, {to, "03:00"}]'
 
-couchdb_version: '3.1.1'
+couchdb_version: '3.3.1'
 couchdb_rexi_use_kill_all: 'true'
 couchdb2_client_max_body_size: 100M
 couchdb_os_process_limit: 1000

environments/production/terraform.yml

@@ -190,6 +190,56 @@ servers:
     group: "couchdb2"
     os: bionic
 
+  - server_name: "couch_a0-production"
+    ## Increase once ready for migration
+    # server_instance_type: c6a.8xlarge
+    server_instance_type: c6a.large
+    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
+      encrypted: yes
+      ## Enable once migration is complete
+      # 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
+    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
+      encrypted: yes
+    group: "couchdb2"
+    os: jammy
+
+  - server_name: "couch_b0-production"
+    ## Increase once ready for migration
+    # server_instance_type: c6a.8xlarge
+    server_instance_type: c6a.large
+    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
+      encrypted: yes
+    group: "couchdb2"
+    os: jammy
+
   - server_name: "rabbit14-production"
     server_instance_type: t3a.2xlarge
     network_tier: "db-private"