summaryrefslogtreecommitdiffstats
path: root/share/common
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2018-08-16 04:32:18 +0000
committerBin Yang <bin.yang@windriver.com>2018-08-17 06:21:56 +0000
commit591cdc9da7149fa4e68eac0de2efa8efd25281d6 (patch)
treefa75681ece5154f4215d78f104661fa99419b504 /share/common
parent400e1b7c35a1db4cdcf20f4453631bc0888a330f (diff)
multi-region discovery
Decouple the openstack region id from cloud-region-id Change-Id: If4bfacf05d87ca4bc97a485d4153f4f379ad451a Issue-ID: MULTICLOUD-311 Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'share/common')
-rw-r--r--share/common/msapi/extsys.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/share/common/msapi/extsys.py b/share/common/msapi/extsys.py
index c0cc7f27..e1534523 100644
--- a/share/common/msapi/extsys.py
+++ b/share/common/msapi/extsys.py
@@ -70,6 +70,9 @@ def get_vim_by_id(vim_id):
viminfo['tenant'] = tmp_authinfo.get('default-tenant')
viminfo['cacert'] = tmp_authinfo.get('ssl-cacert')
viminfo['insecure'] = tmp_authinfo.get('ssl-insecure')
+ viminfo["complex-name"] = tmp_viminfo.get("complex-name")
+ viminfo['openstack_region_id'] = tmp_viminfo.get("cloud-epa-caps") \
+ if tmp_viminfo.get("cloud-epa-caps") else cloud_region_id
return viminfo
return None