Merge pull request #1190 from ssl-hep/mshirley/load-rabbitmq-url-in-boot

set RABBIT_MQ_URL value in helm

Author: MattShirley

helm/servicex/templates/app/deployment.yaml

@@ -51,6 +51,10 @@ spec:
           value: "{{ .Release.Name }}"
         - name: LOG_LEVEL
           value: "{{ .Values.app.logLevel | upper }}"
+        - name: RABBIT_MQ_URL
+          value: 'amqp://user:{{ .Values.rabbitmq.auth.password }}@{{ .Release.Name }}-rabbitmq:5672/%2F'
+        - name: TRANSFORMER_RABBIT_MQ_URL
+          value: "amqp://user:{{ .Values.rabbitmq.auth.password }}@{{ .Release.Name }}-rabbitmq:5672/%2F?heartbeat=9000"
         {{- if .Values.logging.logstash.enabled }}
         - name: LOGSTASH_HOST
           value: "{{ .Values.logging.logstash.host }}"
@@ -105,10 +109,6 @@ spec:
             secretKeyRef:
               name: {{ .Values.secrets }}
               key: rabbitmq-password
-        - name: RABBIT_MQ_URL
-          value: "amqp://user:$(RMQ_PASS)@{{ .Release.Name }}-rabbitmq:5672/%2F"
-        - name: TRANSFORMER_RABBIT_MQ_URL
-          value: "amqp://user:$(RMQ_PASS)@{{ .Release.Name }}-rabbitmq:5672/%2F?heartbeat=9000"
         - name: PG_PASS
           valueFrom:
             secretKeyRef: