aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-10-01 10:28:17 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2018-10-01 10:31:09 -0700
commit42aeeea8514b0ca99005ae64ca360a949ef9c6ef (patch)
tree234a5cd3abe85b5763376058ebcaa4514ee89ae0 /src
parent7d275735c62c9d0ce423327d67494859e285fce7 (diff)
Use Upstream Rabbitmq Docker Container
The upstream rabbitmq container supports specifying the default admin user and password through the environment variables: RABBITMQ_DEFAULT_USER and RABBITMQ_DEFAULT_PASS. Utilizing these variables removes the need to build a rabbitmq container specific to the Pharos LaaS Dashboard. Change-Id: I390d7fa9254a0f28b374235254caff59b219cd87 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'src')
-rw-r--r--src/pharos_dashboard/settings.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pharos_dashboard/settings.py b/src/pharos_dashboard/settings.py
index e3b36b0..8155fd4 100644
--- a/src/pharos_dashboard/settings.py
+++ b/src/pharos_dashboard/settings.py
@@ -165,10 +165,10 @@ OAUTH_CALLBACK_URL = os.environ['DASHBOARD_URL'] + '/accounts/authenticated'
CELERY_TIMEZONE = 'UTC'
RABBITMQ_URL = 'rabbitmq'
-RABBITMQ_USER = os.environ['RABBITMQ_USER']
-RABBITMQ_PASSWORD = os.environ['RABBITMQ_PASSWORD']
+RABBITMQ_DEFAULT_USER = os.environ['RABBITMQ_DEFAULT_USER']
+RABBITMQ_DEFAULT_PASS = os.environ['RABBITMQ_DEFAULT_PASS']
-BROKER_URL = 'amqp://' + RABBITMQ_USER + ':' + RABBITMQ_PASSWORD + '@rabbitmq:5672//'
+BROKER_URL = 'amqp://' + RABBITMQ_DEFAULT_USER + ':' + RABBITMQ_DEFAULT_PASS + '@rabbitmq:5672//'
BOOKING_EXP_TIME = os.environ['BOOKING_EXPIRE_TIME']
BOOKING_MAX_NUM = os.environ['BOOKING_MAXIMUM_NUMBER']