From 9fca09e95d691aa6b0567ffc199b1c475517c3f0 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Tue, 15 Nov 2022 12:30:11 +0800 Subject: [PATCH] Fix hostname issue deprecate ENV vars REDIS_HOST and DB_HOST and API_HOST Issue-ID: INF-360 Signed-off-by: Bin Yang Change-Id: If60773de690d218a06bf82c584d7d524336f1475 --- o2common/config/config.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/o2common/config/config.py b/o2common/config/config.py index 9c1d610..d4e7107 100644 --- a/o2common/config/config.py +++ b/o2common/config/config.py @@ -36,8 +36,9 @@ def get_smo_ca_config_path(): def get_postgres_uri(): - host = os.environ.get("DB_HOST", "localhost") + # host = os.environ.get("DB_HOST", "localhost") # port = 54321 if host == "localhost" else 5432 + host = "localhost" port = 5432 password = os.environ.get("DB_PASSWORD", "o2ims123") user, db_name = "o2ims", "o2ims" @@ -45,7 +46,8 @@ def get_postgres_uri(): def get_api_url(): - host_interal = os.environ.get("API_HOST", "localhost") + # host_interal = os.environ.get("API_HOST", "localhost") + host_interal = "localhost" host_external = os.environ.get("API_HOST_EXTERNAL_FLOATING") if config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING is not None and \ config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING != '': @@ -77,8 +79,9 @@ def get_o2dms_api_base(): def get_redis_host_and_port(): - host = os.environ.get("REDIS_HOST", "localhost") + # host = os.environ.get("REDIS_HOST", "localhost") # port = 63791 if host == "localhost" else 6379 + host = "localhost" port = 6379 return dict(host=host, port=port) -- 2.16.6