diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml index 19d74318..a1596e31 100644 --- a/charts/templates/deployment.yaml +++ b/charts/templates/deployment.yaml @@ -122,6 +122,8 @@ spec: value: {{ .Values.ocloud.OS_PASSWORD }} - name: OS_USERNAME value: {{ .Values.ocloud.OS_USERNAME }} + - name: OS_REGION_NAME + value: {{ .Values.ocloud.OS_REGION_NAME }} - name: PYTHONDONTWRITEBYTECODE value: "1" - name: REDIS_HOST diff --git a/charts/values.yaml b/charts/values.yaml index 83629c4f..ee88d9c3 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -77,6 +77,7 @@ ocloud: OS_AUTH_URL: "" OS_USERNAME: "" OS_PASSWORD: "" + OS_REGION_NAME: "RegionOne" K8S_KUBECONFIG: "" API_HOST_EXTERNAL_FLOATING: "" HELM_USER_PASSWD: "St8rlingX*" diff --git a/o2common/config/config.py b/o2common/config/config.py index f8eee94b..2ad1da36 100644 --- a/o2common/config/config.py +++ b/o2common/config/config.py @@ -63,6 +63,11 @@ def get_api_url(): return f"https://{host}:{port}" +def get_region_name(): + region_name = os.environ.get("OS_REGION_NAME", "RegionOne") + return region_name + + def get_stx_url(): try: return get_stx_client_args()["auth_url"] @@ -150,7 +155,8 @@ def is_ipv6(address): return False -def get_stx_access_info(region_name="RegionOne", subcloud_hostname: str = "", +def get_stx_access_info(region_name=get_region_name(), + subcloud_hostname: str = "", sub_is_https: bool = False): try: client_args = get_stx_client_args()