fix: wpb-22439 enable rabbitmq-external to replace in-k8s rabbitmq deployment

Author: mohitrajain

bin/helm-operations.sh

@@ -27,7 +27,7 @@ process_values() {
 
   ENV=$1
   TYPE=$2
-  charts=(fake-aws demo-smtp rabbitmq databases-ephemeral reaper wire-server webapp account-pages team-settings smallstep-accomp ingress-nginx-controller nginx-ingress-services coturn sftd cert-manager)
+  charts=(fake-aws demo-smtp databases-ephemeral reaper wire-server webapp account-pages team-settings smallstep-accomp ingress-nginx-controller nginx-ingress-services coturn sftd cert-manager)
 
   if [[ "$ENV" != "prod" ]] || [[ -z "$TYPE" ]] ; then
     echo "Error: This function only supports prod deployments with TYPE as values or secrets. ENV must be 'prod', got: '$ENV' and '$TYPE'"
@@ -174,7 +174,7 @@ process_values "prod" "secrets"
 configure_values
 
 # deploying with external datastores, useful for prod setup
-deploy_charts cassandra-external elasticsearch-external minio-external fake-aws demo-smtp rabbitmq databases-ephemeral reaper wire-server webapp account-pages team-settings smallstep-accomp ingress-nginx-controller
+deploy_charts cassandra-external elasticsearch-external minio-external rabbitmq-external fake-aws demo-smtp databases-ephemeral reaper wire-server webapp account-pages team-settings smallstep-accomp ingress-nginx-controller
 
 # deploying cert manager to issue certs, by default letsencrypt-http01 issuer is configured
 deploy_cert_manager

bin/offline-cluster.sh

@@ -53,9 +53,8 @@ ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/minio.yml
 
 #ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/postgresql-deploy.yml
 
-# Uncomment to deploy external RabbitMQ (temporarily commented out until implemented in CD), PS. remote --skip-tags=rabbitmq-external from the next section
-#ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/roles/rabbitmq-cluster/tasks/configure_dns.yml
-#ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/rabbitmq.yml
+ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/roles/rabbitmq-cluster/tasks/configure_dns.yml
+ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/rabbitmq.yml
 
 # create helm values that tell our helm charts what the IP addresses of cassandra, elasticsearch and minio are:
-ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/helm_external.yml --skip-tags=rabbitmq-external,postgresql-external
+ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/helm_external.yml --skip-tags=postgresql-external

values/wire-server/prod-values.example.yaml

@@ -28,7 +28,7 @@ brig:
     elasticsearch:
       host: elasticsearch-external
     rabbitmq:
-      host: rabbitmq # For k8s-based RabbitMQ (default). Use 'rabbitmq-external' for production external RabbitMQ VMs
+      host: rabbitmq-external # For k8s-based RabbitMQ (default). Use 'rabbitmq-external' for production external RabbitMQ VMs
     #postgresql:
     #  host: postgresql-external-rw # DNS name without protocol
     #  port: "5432"
@@ -132,7 +132,7 @@ cannon:
   drainTimeout: 10
   config:
     rabbitmq: # Default value for CI, for on-prem deployment, use rabbitmq-external
-      host: rabbitmq
+      host: rabbitmq-external
     cassandra:
       host: cassandra-external
   metrics:
@@ -169,7 +169,7 @@ galley:
     cassandra:
       host: cassandra-external
     rabbitmq: # Default value for CI, for on-prem deployment, use rabbitmq-external
-      host: rabbitmq
+      host: rabbitmq-external
     #postgresql:
     #  host: postgresql-external-rw # DNS name without protocol
     #  port: "5432"
@@ -201,7 +201,7 @@ gundeck:
 #    tag: some-tag (only override if you want a newer/different version than what is in the chart)
   config:
     rabbitmq: # Default value for CI, for on-prem deployment, use rabbitmq-external
-      host: rabbitmq
+      host: rabbitmq-external
     cassandra:
       host: cassandra-external
     aws:
@@ -307,7 +307,7 @@ background-worker:
     federationDomain: example.com
     # logLevel: Debug
     rabbitmq: # Default value for CI, for on-prem deployment, use rabbitmq-external
-      host: rabbitmq
+      host: rabbitmq-external
     cassandra:
       host: cassandra-external
     cassandraGalley: