X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;fp=o2common%2Fconfig%2Fconfig.py;h=c93d3889be59bbdef0fb700d312fc324ad6c9603;hb=be800932369a354559471d6a6a6ca2bd6ec11aec;hp=2e474144597e0bff3be0a1430611258428853597;hpb=8ce4f0cb5acc8af28a7ed0ff101bb2b2804cf73e;p=pti%2Fo2.git diff --git a/o2common/config/config.py b/o2common/config/config.py index 2e47414..c93d388 100644 --- a/o2common/config/config.py +++ b/o2common/config/config.py @@ -36,18 +36,15 @@ def get_smo_ca_config_path(): def get_postgres_uri(): - # host = os.environ.get("DB_HOST", "localhost") - # port = 54321 if host == "localhost" else 5432 - host = "localhost" - port = 5432 + host = os.environ.get("DB_HOST", "localhost") + port = int(os.environ.get("DB_PORT", 5432)) password = os.environ.get("DB_PASSWORD", "o2ims123") user, db_name = "o2ims", "o2ims" return f"postgresql://{user}:{password}@{host}:{port}/{db_name}" def get_api_url(): - # host_interal = os.environ.get("API_HOST", "localhost") - host_interal = "localhost" + host_interal = os.environ.get("API_HOST", "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 != '': @@ -87,10 +84,8 @@ def get_o2dms_api_base(): def get_redis_host_and_port(): - # host = os.environ.get("REDIS_HOST", "localhost") - # port = 63791 if host == "localhost" else 6379 - host = "localhost" - port = 6379 + host = os.environ.get("REDIS_HOST", "localhost") + port = int(os.environ.get("REDIS_PORT", 6379)) return dict(host=host, port=port)