diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-10-01 10:28:17 -0700 |
|---|---|---|
| committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-10-01 10:31:09 -0700 |
| commit | 9bab3b54b4382938f6a0347e8f47b1825c4f869c (patch) | |
| tree | a6b274ffc443cc344b5794926583067967727925 /dashboard/src/pharos_dashboard | |
| parent | a048f1a39fdaf1767fce4492605b995cc62f1aa0 (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 'dashboard/src/pharos_dashboard')
| -rw-r--r-- | dashboard/src/pharos_dashboard/settings.py | 6 |
1 files changed, 3 insertions, 3 deletions
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'] |