From 9bab3b54b4382938f6a0347e8f47b1825c4f869c Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Mon, 1 Oct 2018 10:28:17 -0700 Subject: 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 --- dashboard/src/pharos_dashboard/settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dashboard/src/pharos_dashboard') diff --git a/dashboard/src/pharos_dashboard/settings.py b/dashboard/src/pharos_dashboard/settings.py index e3b36b0..8155fd4 100644 --- a/dashboard/src/pharos_dashboard/settings.py +++ b/dashboard/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'] -- cgit 1.2.3-korg