Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix the alarm exception about the alarmDefinition
[pti/o2.git]
/
o2common
/
config
/
config.py
diff --git
a/o2common/config/config.py
b/o2common/config/config.py
index
06c3b56
..
2ad1da3
100644
(file)
--- a/
o2common/config/config.py
+++ b/
o2common/config/config.py
@@
-63,6
+63,11
@@
def get_api_url():
return f"https://{host}:{port}"
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"]
def get_stx_url():
try:
return get_stx_client_args()["auth_url"]
@@
-150,7
+155,8
@@
def is_ipv6(address):
return False
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()
sub_is_https: bool = False):
try:
client_args = get_stx_client_args()
@@
-386,7
+392,7
@@
def get_reviewer_token():
def get_auth_provider():
def get_auth_provider():
- return
'k8s'
+ return
config.conf.auth_provider
def get_dms_support_profiles():
def get_dms_support_profiles():