diff options
| author |   maxbr <maxbr@mi.fu-berlin.de> | 2017-05-05 10:02:56 +0200 |
|---|---|---|
| committer | maxbr <maxbr@mi.fu-berlin.de> | 2017-05-05 10:28:14 +0200 |
| commit | d4d63f63f1ab4cd636499adee319f2a0b8513020 (patch) | |
| tree | 34b52298d10cffd8ee768b51e3341ae63f75f631 /tools/pharos-dashboard/src/pharos_dashboard | |
| parent | eb878efa9b5222de678ed84373d6ac056c3b129e (diff) | |
Pharos Dashboard: Add manual resource management
Dev Pods are now managed by checking the "Dev pod" box in the Admin
Panel. This commit also fixes a dead image URL and the oauth process for the
dashboard URL.
Change-Id: Ic94160eb3a4504a369606261440df0e5354ac027
Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
Diffstat (limited to 'tools/pharos-dashboard/src/pharos_dashboard')
| -rw-r--r-- | tools/pharos-dashboard/src/pharos_dashboard/settings.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/pharos-dashboard/src/pharos_dashboard/settings.py b/tools/pharos-dashboard/src/pharos_dashboard/settings.py index 084f8786..546b174e 100644 --- a/tools/pharos-dashboard/src/pharos_dashboard/settings.py +++ b/tools/pharos-dashboard/src/pharos_dashboard/settings.py @@ -5,7 +5,7 @@ from datetime import timedelta BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True # Application definition @@ -157,13 +157,16 @@ OAUTH_REQUEST_TOKEN_URL = JIRA_URL + '/plugins/servlet/oauth/request-token' OAUTH_ACCESS_TOKEN_URL = JIRA_URL + '/plugins/servlet/oauth/access-token' OAUTH_AUTHORIZE_URL = JIRA_URL + '/plugins/servlet/oauth/authorize' -OAUTH_CALLBACK_URL = JIRA_URL + '/accounts/authenticated' +OAUTH_CALLBACK_URL = os.environ['DASHBOARD_URL'] + '/accounts/authenticated' # Celery Settings CELERY_TIMEZONE = 'UTC' RABBITMQ_URL = 'rabbitmq' -BROKER_URL = 'amqp://guest:guest@rabbitmq:5672//' +RABBITMQ_USER = os.environ['RABBITMQ_USER'] +RABBITMQ_PASSWORD = os.environ['RABBITMQ_PASSWORD'] + +BROKER_URL = 'amqp://' + RABBITMQ_USER + ':' + RABBITMQ_PASSWORD + '@rabbitmq:5672//' CELERYBEAT_SCHEDULE = { 'sync-jenkins': { |