Step 2: Release the image to prod repository

[it/dev.git] / xapp_onboarder / xapp_onboarder / server / settings.py

diff --git a/xapp_onboarder/xapp_onboarder/server/settings.py b/xapp_onboarder/xapp_onboarder/server/settings.py
index 58c7392..04100a5 100644 (file)
--- a/xapp_onboarder/xapp_onboarder/server/settings.py
+++ b/xapp_onboarder/xapp_onboarder/server/settings.py
@@ -17,7 +17,7 @@
 import os
 
 # Flask settings
-FLASK_SERVER_NAME = os.environ.get('FLASK_SERVER_NAME') or '0.0.0.0:8888'
+FLASK_PORT = os.environ.get('FLASK_PORT') or '8888'
 FLASK_DEBUG = os.environ.get('FLASK_DEBUG') or True  # Do not use debug mode in production
 
 # Flask-Restplus settings
@@ -29,7 +29,7 @@ RESTPLUS_ERROR_404_HELP = os.environ.get('RESTPLUS_ERROR_404_HELP') or False
 # xapp_onboarder settings
 CHART_WORKSPACE_PATH = os.environ.get('CHART_WORKSPACE_PATH') or '/tmp/xapp_onboarder'
 CHART_REPO_URL = os.environ.get('CHART_REPO_URL') or 'http://0.0.0.0:8080'
-HTTP_TIME_OUT = os.environ.get('HTTP_TIME_OUT') or 10
+HTTP_TIME_OUT = int(os.environ.get('HTTP_TIME_OUT') or 10)
 HELM_VERSION = os.environ.get('HELM_VERSION') or '2.12.3'
 HTTP_RETRY = os.environ.get('HTTP_RETRY') or 3
 ALLOW_REDEPLOY = os.environ.get('ALLOW_REDEPLOY') or True
@@ -38,8 +38,3 @@ MOCK_TEST_MODE = os.environ.get('MOCK_TEST_MODE') or False
 MOCK_TEST_HELM_REPO_TEMP_DIR = os.environ.get('MOCK_TEST_HELM_REPO_TEMP_DIR') or '/tmp/mock_helm_repo'
 
 
-# Environment variables that will be passed into xApp
-DBAAS_MASTER_NAME = os.environ.get('DBAAS_MASTER_NAME')
-DBAAS_SERVICE_HOST = os.environ.get('DBAAS_SERVICE_HOST')
-DBAAS_SERVICE_SENTINEL_PORT = os.environ.get('DBAAS_SERVICE_SENTINEL_PORT')
-DBAAS_SERVICE_PORT = os.environ.get('DBAAS_SERVICE_PORT')