Merge pull request #6112 from pvisweswar/SAAS-14853/Terminate_stopped…

…_celery_servers Terminate the celery nodes
dimagi · Sep 1, 2023 · 66d3232 · 66d3232
2 parents 493c446 + 399ecd0
commit 66d3232
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 48 deletions.
diff --git a/environments/production/app-processes.yml b/environments/production/app-processes.yml
@@ -14,7 +14,6 @@ management_commands:
   pillow_a2000:
     run_pillow_retry_queue:
 celery_processes:
-  celery_c2000: {}
   celery_a2000,celery_a2001,celery_b2000,celery_b2001:
     analytics_queue:
       pooling: gevent

diff --git a/environments/production/aws-resources.yml b/environments/production/aws-resources.yml
@@ -6,18 +6,6 @@ celery_b2000-production: 10.202.11.13
 celery_b2000-production.instance_id: i-06eb74c681e6db76c
 celery_b2001-production: 10.202.11.134
 celery_b2001-production.instance_id: i-097579a99695c543d
-celery_b2002-production: 10.202.11.67
-celery_b2002-production.instance_id: i-083f3ef7bea3aef65
-celery_b2003-production: 10.202.11.157
-celery_b2003-production.instance_id: i-0bd94017c14e238e1
-celery_c2000-production: 10.202.12.223
-celery_c2000-production.instance_id: i-070bdcda540276c82
-celery_c2001-production: 10.202.12.173
-celery_c2001-production.instance_id: i-0cb8138d20c3c2c9b
-celery_c2002-production: 10.202.12.227
-celery_c2002-production.instance_id: i-00ca3cfaa4a0689f1
-celery_c2003-production: 10.202.12.41
-celery_c2003-production.instance_id: i-0215d5ce40c7490bb
 celerybeat_a0-production: 10.202.10.254
 celerybeat_a0-production.instance_id: i-01f0c88bdcd6cd42e
 control4-production: 10.202.10.11

diff --git a/environments/production/inventory.ini b/environments/production/inventory.ini
@@ -213,14 +213,10 @@ celery_a2001
 celery_b2000
 celery_b2001
 
-[celery_c2000]
-10.202.12.223 hostname=celery-c2000-production ufw_private_interface=ens5 ansible_python_interpreter=/usr/bin/python3 ec2_instance_id=i-070bdcda540276c82 root_encryption_mode=aws
-
 [celery:children]
 celerybeat_a0
 celery_a2
 celery_b2
-celery_c2000
 
 [celery:vars]
 swap_size=2G

diff --git a/environments/production/inventory.ini.j2 b/environments/production/inventory.ini.j2
@@ -139,13 +139,10 @@ kafka_c1
 
 {{ __celery_b2__ }}
 
-{{ __celery_c2000__ }}
-
 [celery:children]
 celerybeat_a0
 celery_a2
 celery_b2
-celery_c2000
 
 [celery:vars]
 swap_size=2G

diff --git a/environments/production/known_hosts b/environments/production/known_hosts
@@ -76,9 +76,6 @@
 10.202.11.136 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJfxUVqHarKACGJd5bxfw74ZlxjUrbtgaSzc44d2OirHwrg0B/TKj6LQwI/21BoTZnSOO+EQvBuvkp/3xVHMCPI=
 10.202.11.136 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFnRu8taqGtPCgEgM+NPLntNfHTSUzeAUFPtFiFI4Kq8
 10.202.11.136 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCI2sZPOViWes8e516N56pXcGNiGPYfAcsAUtqkJe9PO7Tdt+5tAAwa8C42eqQnxDqVCcD43I6HJa4sgi7gJfje+/B32a+Na2xujz6SboTErMPPEISaXBQqcwcVgAbm4kBL4jI8SJSzwUR/KtAwH4ZWogCb/vwtfqVrYMwAtYHpX/1jfTkVsfHvIMxn/LyAbcwtqjdztUAUeLWe8GNc6c8ow1+1bnDv92q8dtdg47TKnro1SFj/CzW57FttFdHeEgpb/CnoUgSSKpvX01euwK5AhC0GbxR0BQb2Q9MIWrI35MSEa9LlkH7K00A8vXVUclxlG+NpconHSF+SW0DxKCjFM2bAcZJvk2FcjL1JWZbOAkOMP6CRXaesZ1DZqhkF9tPi+LpRv8kkdK6Yj2cnSAWrAqCil6T5beJfBBcmmd9TQ00hkq5fk4HIER7mYbNqzJk3jkKKYhpK/fj7RPtWkCGD5RoHEfQYc4YE4DHtmpRUrJJ1B+crTy6Im/OlhzK1cO0=
-10.202.11.157 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC05IdINghM50O1GsefRmn+AcE0tbZsdKLGhK0LHWhzjF1JUyQLFVq+06TXJDhKSdFTvManRhzFLUGLlmJ9kG2k=
-10.202.11.157 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG5lj2dWj1+Jn/+5QxGWSObXlugDg0/OfYaax59HjsJ/
-10.202.11.157 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCw8x1xpuKie+74z095yxxmaF7AjcbJGqlSkutOJskXIoJOTsFDePmLU/c7X1pZeIlCny04/NJ5XA8k0c3JdirxO9VDbPfNJbhRlg4P50/vng4MGWYvFJbIItnBHimvMTb7jxScEsKtBUubN00LDP5U4Tn0HnJHHQFBXmF7WSvj2pKpkSki4HA2B3yfRyd93KtfC9sMfEvn9ZvKPtYsEntj0lpGHarKgT1mcA8rOXcqOPL0eF1C4jrLvpfR+UmfAgbXxxQzJPekgOhmf+PMM4/vtDV2EGObW1T8u9NFJFz1aM6PZ605XO/mzqeL7N6f3yRTXqxfD51tFK5rV9b5pYLJbwngm1745sjySuCLdpbGqIOKXgKZWRiwAsPZsJyA2wwSz1Ka9ffAoMOdryauti6ezfhHcI5MI/JzdTliXfWZlSgZQej01fixqpfBCDTcwAwNbhGgtlQEjvNbIf2yUrIAM5/mkQc/yIZYBfPU6oPpP6q6XbY3kgvCG3MTRjjfV8E=
 10.202.11.178 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNCX81e0TFjjbvm2dXVUFwvPQWSnB74qhOYkFVbKeMKQI3cVG/LWx7rETkhsKRVA6YFx1TvP7dkf+dy+J2Ezv7k=
 10.202.11.178 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0KVr3zCxN/Buv2WT//wjM+xngrze1Jdrn9dz4XdWOL
 10.202.11.178 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDKbG+Up1ouEm63WTrsN+iKKkL0zCtTsaoxQqeilO3eQJEwztPzkqCxBq1i6RV6gNNtoH7jZt3zyGQa29mm5gQDSYBxV8+j9bmlrzd7eLtUBMQjr0wzdSJFPNL6+ZSe+PLq+WyNk87cLAGjWlB8MMrS5cONjJPHdl4dY4VGZG2qlfWdMrHele5uCAHPudG3lSYy2Cgkrd4/HtMl70O1NbPLXY7BYTWxplZYkgYdNjsEd624YZ9RNFPAfj7siPUMNXNdwUeeI5fw8ZoD6ZbGIGb79j66m2DgFmMnVsbuaiLYC1Q1oAPapD2e3+Fm3TYaXfcgz7Y9BeuHjCbQxnUODaoOQtvCJNoA6XCM9Uo1IVnbJLfTkiAWEGCWeEJqFWbv/oiUURoPHHAmHwnuXvpTRy64d/DOWuE5hqLcpI0cHC7p+BnZN7n4PsVMusrprCTbe6dC23v7unMcz3EzvmUFG6fBuhYRS0s6UE6MszD8DwMXpQa+ZXOEE3THQX3T7hO/kp8=
@@ -91,24 +88,9 @@
 10.202.11.57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCyXDYRZ2eWh4UFGRXpip5fy+/GdxnkV+2Nio7sVREb5vwOqtD07jD8fXM8wMVjFpBR/+kL0Fz4OoBG2qyRsDRQ=
 10.202.11.57 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAT+V0gaZOazmRe+czzayTBHuiawb0hr34IQ+MxK5HCU
 10.202.11.57 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCu/KksHoLADeXWnjW5PTm+ZEDyL9Jt2sVC0+5RJQo3Le88gfH8Cz/K5tgpV7ZhViTqqExGfjjTlzyqRGRzOmTVAo77kDEgBIohlSDKHTPyrulaueztoN3y+ROILMNmkFwGelp6jZdHyCPMgRZR3RtcDbZmUqPQAJU1s/TdBv9DGHFSDRfr9ND06QY1paFiVQqzSllCge3lnOG2d/otGUZ2rHSVXQmM774Ughv9Q5PFNiRIKbIr0gPMn/8kE4uWAepw5LXhW6vuR8PH6VA7BJ7Q+j8pfgllCTcc3alYxwuttlftEriUUAEoL9MidzBdYzLYLYum0pRPd7V2gzJ3Af7xutwxuUfPs1EuHILiBI6XFHnglygDF68sK3GRrFC8jswJteAgDFObx1UajwveGcvtAHY9Fr1kodD+9P9kHdHEb48hluH+NdNoW8LxJY1izc38zRKz5KlR/RWoKwpOinWvj/HOVlb2uD739GuVFCpFPqjveu7pF47f1FQ2wZqfuM0=
-10.202.11.67 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJxXmp+xJmVb4oi2gwQKwcmAlzfcmRJMokpQ3zSj1NdZQtoXd1tZMNGdU+wOXbY5evdnWj1h6AV+CExy5+zMll0=
-10.202.11.67 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG8Gi0Xp4fVLVamNZlblQcxcHGk80yarYyv49XpMutk5
-10.202.11.67 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCalfK4M1b0yBBA9V9EB+W3KRscInidcbbnNK4Ua91OWoqxoWFN9f0E2ZL845qRwbc19YNON6frwP9me/wOO94sFTMANOGu4jmPzRepiOjT+faHq5IINpJOW3j62t25cUoTZS9UC5qB+5CTBGpoDvSsB1YvcnV/RpczIcHMiz5m9Uu+9vUY5PSfrsH9CDuXYJSyv1u/pVmShZ1lrH8H0skrB7UrKRId03TwfMTbbL/5eFSdTGKfcOKcyzkSC2042mx5jcDZvAAD3wsbm0GMFBFy3Vq2ykkzv4JcwZG4iW09sFMGjIoA6mK1tbvlAraXF8VUzG7PS6mSUSVxw3GERb/cJYBvg+/IrSkHvevj8XA7Wr8wip9pagOuSDiMs6qUBoDbqngEp1QxPaRjMpxzJvj3LhWN01UUgGhC0pm2u/lmz8TyO8s4eQuNHv56JCkzPPvJNQHdvV3uwPIAVbsJt3WTSMbzzQjCZgUW8Ptj5IRJH72mDhcfNU8cGZJ7FYvNPKs=
 10.202.11.87 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPnilrYE2JLp/u+FcyBQTegk4t7r4rxs3xnEJJayTcirsCqLQd8MpikSVaJz5h8pJDTu1/+qnvM1hZMavveYHAo=
 10.202.11.87 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP/VNYWD5omgGl3o2UirQcF0fVLFWKKMQ560i1rTaGqO
 10.202.11.87 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0dWZI/YaTcTZeLWlmZANfOugtWS6GCnNSLorYDMv8ginO0VtKGxkiwwM0gpWtj5sFJBu3pofF8gMmpKk4uMCOA7JCxSUPuvsBDhWAJOgVYd6HGRF2+NB4ZpuBn5pPkWTkxLea5uIIVVTQ3VHZSquakDB7Zzh0hqTxTNmQ3C01UuP8EvLfiYUnHZANW1LulCa8TgSU1nc2h3Q6MQZXcMtHaJLtbx1hmF101oucfRPzU0xkjKCJuXl1yUEWbE144gV60tfkVbpfmVEl0TevQ8/M18A+/7z00hJU3ZWlUtTy9FF9AP/EsbviDfpyKZOOhVwqoccaDYxOCzWP4NfKg7oC6JgCQnb2nBYUj8+pYNLreouW4K48Xu8YaMOwQ3VpHFdih0XBRxq7iF5xWuCVG2aLaJwFrxRhM1KPBmmLIpYbYz4GcnMiWtqeL5Md6uGDVXtMLaJr2vonB5JhZfgY2XvzJcorA1LRKQKb72IrmFlmMG3r3Ei1G2LdAJDAzoBikTs=
-10.202.12.173 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE2J5AQ0wsy6T1SG1mgEaRMgU1Z6vy1CY6317UUnXNGJlHRtYrulHncJ6DJKlE54YibtnV6vxjgHD4QZh17Tzt0=
-10.202.12.173 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICO6AJcofVWz+ioqyHa2TpIQay2c5S6nTLSQqNx8aZdT
-10.202.12.173 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDRtvkScbbHTgzfjq78VQkWjzacmtbbqSO3YXLVR+4GfBX1FB9IBBjoQ0Q3ZR/embxSs9gx1RTXIOeeRzMyeTT/qZcXX6SCBdrFzUivU1YbH4hD8Z1UQXRsGj8MVaGletR3fwwZ9fcJ97S5GkKXRHwH/LVUsHFqYC9XmyvxTzhiIyK9Zt06RPDQWQd5fO35/YyuxyO3G3cBiZcdrNDXIR5uJFMU/xnyVo6wstWpT4fuWSBtMGQmUxMAqO9/B00ct6J7DOVaxqSL9FxQYUKiqH2wfgRk2oS3LPlAEDJRrakFvoLvsJ+Ay7HbSk2CZh9/uf+z3spNEgEbAdHRTAYmZa/f6B2E2V8U6INO/QJguMvuugeIJdQgvgp5pEGl1lBdH0JTwldLF2bgYdwuIOUIvKTLapeKHtz5549woUs31inNUymN0XM0/XGTo6rLqH1jvg5kOwf10YNXBOKJpEzimuR+Xu/Uym7AYUuqo/m6OeFxUf28jn0E3Xz2PCfi7is4PNM=
-10.202.12.223 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFLg4YAGCpUbjQ4ho+QGgY1Q9fjAJcbEICYYG7wB0pT7KEx1y3Slgs80XbPhfQmQ03NDRsvqT04KU7Ixnp2WYvE=
-10.202.12.223 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPSQGXcL875F48d3yHFpvdb8hYgL8y6mmbaz6TTFLKnp
-10.202.12.223 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQP1bHAKe8BDKCGgk9KHALR+qRbKh/a3PG0xsT6tRlXeKMAhn8/N7wz70+fDvWERVkjLqcpxgWrE5nW+vS72+ROv9tS6BxKviVKMttlJVKUuuw0gl0B/WXW3yHZV4YqnpdH1+qeGdynshEJ7hk7EO+SsbxAf+4hUbf0jfyCwqnoU0/GDYnnwtpZCdRpQzMq18JtZBrVe8JYbwIkdTe0gS3N/D5asbsu+HVXGwonJwztd09ShZONLCFRhKgDsuMC0ML4UibPMknUZwygg1XOgqow0eYXLOJP20CE6DrPkhekMCs2PioDKysi/Ej+e8CUvxkYi1FGx6tinu0AcbNFnykRrgaKexmrlAVVuwEmoYZHKZXZEenG6zShVTtlLva6CqZMdlm5zZU0YYfMLb+A8VmMXv1NO87csqfqF5qMyRhGCz8QXAOASXUrQaQZiDSRca2NvhckZOln+ndv201xnoZyS0M/Cxgj1p2/kKUKqm8VWFkO0TXXIKNxpjNshMIcy0=
-10.202.12.227 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMy2NPTZuU9eLDiOpRxrCfqa5B5dCcpc2nj0kwV1u9XJU9Ibf8Hl55PS7sQZ/AhC1dXPRVfrieveCAvremmRe/E=
-10.202.12.227 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIiTiXBFmQPCCrZ7M/sJajIywpK7eKBKGV9a+hVPpmBv
-10.202.12.227 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDBAgiqHAlqvdxZTHAMXzAr3yLojn8QLp6y++/BO4v2X4SaSTsrXF8kpGX/zRijIQcMgi6ZY8uwldjBG9vgoR3ExEz3Q6qi8B9cEasdZG+mj6w6er2chmDoqq1Cz1LS1ukR7JKNksXT+fH6XSAOg1J1chL5s2+S9/nFXd1lElYC9HcZv9NIJyoTZ/A7un363Xdw9ATxJxpMG2C0rAVQnJtbY1hz1dL6fdhcJTtA33XEG32WAskHcY7ncZMQvgn2f+KOcmaKxLqwgwsXaCGUh7eIEp1NFV/8WYfq4uK5qx56vM7aKEbtrIW/MIBC/VRaFlJaWFCCJEb46kRNAezw8WhSwnx+Q21loG66U+cHhTazJH9U7rHyypmFCISjc0ELZkXvYYAH+wfF9jyXVkU0Hhw8tsPpdyKEm5vBH9EXEsbzSmne6+n2zfarJ4DLYBqMIFEpRoGVHFHpf4e7c1ngCkQdhwWaHv1RdGU4IWlcMzdzKsCKc2JQ5BdzoA1nBdUNRmU=
-10.202.12.41 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEuuIGOcrNhNZcPz2igjvEPWO1b2VN52xDl9yQMas2xSVdoCGUQtSWR20kIQPumLh8za9+90ETfjVifGWC2yCRs=
-10.202.12.41 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOXrQMkk6MXTPpASMmShmJVMjt+aOkD1v/VarG6KFudq
-10.202.12.41 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCf+y6vRBAk+iTEy0+PLseD4cdU14h6qoVsSI0hpAaJmBj8g+xrwLf4L9S/k51qx/6lP65P1XbzHlAT4N5HYQXhCNL4PifYQB81qYcG3D/pkq9sYTMaD8K4DaURLwObzilEl3wxV4RSWgJ7XY0hidypjlvUKaqDqewdUANAKTEb/TXvQ6sEirS67bu7rEciDEgc+PWaiSYnBIgm+U5a9yBmtdHhU3QZOPWAi0D4zi989xTDs4ROvHAsaJVqs15cVKPDgSeWbseap9ti4iNzWB1Xp/qIyk7LmVWUYPaJO1nkADi06LrxquUMmlBQs+un0p3v8aIMRDFl2mMnvGStG/0JTtoflQP7azD+qg7CFf9eITzSaueY1iEbPcimES/9JLHl0h79FDxJ/O5Dewn49rwjdHqhcTT/6YvvQX2DZRTsk1uyM1gWaVP8UG/SgPQT8SVwb6rTy9ieVbbF/o4EWoRTmAaV+m+DxK9mgKndH9vKmhM4AyIEG3TM9Qa0cMwu4KM=
 10.202.40.108 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAZ6uwEnkxQS16xDSJ6YUP7/CEwVi0dcVTqh5BuMN/C3h46n47GzGZDI50qpTrkt6XucciSbxpG8iPvnCcO2xMk=
 10.202.40.108 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILXiEwsy//psL6oA0vRSAt9bPzlatNgv6tPjWiXyVhPP
 10.202.40.108 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFKq8Vnqq6G5ppAPSvOR4x1ll8RZYMCAk3X3xsmR6cbUQUwP61zmBUnytl7FgbssFv1y7sbGMgmsH3Wrd6yS4YUFh4pUEjtHk5Vcpe5FIslbDXynbtuBHnli3+zXdnKhfCfM2oNYJpxUd7ChFZR83jPiNSHYJiDjVEn88C99lKlieJ3V+CTb4Z9KY62J/l9WiX8Z6ak7il/WFORmFDlmS0GDbPq93HF6+A7SYzsmvuOeszJjFeExlrizDfzXyrbCLkKma4FaTQNCZdL1JmzWeWgF8jh/5YQrhDAkDhn7NI5taJ5k0NgmMW3tSr3Aw6vwCDEpNJtiCRWAF20qDjFMXfrrRSOxvYTCfYDBjGzah/KKCQrhobaVzBfgPq8qyH/g1pZU++43G+Y4nD4EIYSa9S4ytmxOt+Ov8du3hmxUvMCjTzGx+d8gV2RWxC/vI+sjVcJ0MEMyAnXZhhvDFSHgqORdOcgmnRBBV0OmKFcrtyc4IQ99hE0DZ92cMKuBGB90k=

diff --git a/environments/production/terraform.yml b/environments/production/terraform.yml
@@ -237,16 +237,6 @@ servers:
     os: jammy
     count: 2
 
-  # celery beat machine (singleton)
-  - server_name: "celery_c2000-production"
-    server_instance_type: r6a.xlarge
-    network_tier: "app-private"
-    az: "c"
-    volume_size: 83
-    volume_encrypted: yes
-    group: "celery"
-    os: jammy
-
   - server_name: "pillow_a2{i}-production"
     server_instance_type: r6a.4xlarge
     network_tier: "app-private"