diff options
| author |   Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-09-20 04:53:04 +0000 |
|---|---|---|
| committer | Xiaohua Zhang <xiaohua.zhang@windriver.com> | 2018-09-20 04:53:04 +0000 |
| commit | d6d8cbf451a596aa7cbaa240fbcafb288a3494bc (patch) | |
| tree | e2ccc49af7370ba9dac76dc51f873bd0b01c045b /share/newton_base/registration/registration.py | |
| parent | d6279df2157d37978895cb246b2e52cb992c3d1f (diff) | |
Filter endpoint filter mismatch with keystoneauth1
keystoneauth1 accept region_name as endpoint filter,
which will match either region_id or region of the
endpoint catalog
Change-Id: I7ba1f7904e4b3004565d826f4ea3cd345ce45f62
Issue-ID: MULTICLOUD-364
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
Diffstat (limited to 'share/newton_base/registration/registration.py')
| -rw-r--r-- | share/newton_base/registration/registration.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/newton_base/registration/registration.py b/share/newton_base/registration/registration.py index 01748f8a..d5b75cf6 100644 --- a/share/newton_base/registration/registration.py +++ b/share/newton_base/registration/registration.py @@ -42,7 +42,7 @@ class Registry(APIView): vimid, content_key): service = {'service_type': service_type, 'interface': 'public', - 'region_id': viminfo['openstack_region_id'] + 'region_name': viminfo['openstack_region_id'] if viminfo.get('openstack_region_id') else viminfo['cloud_region_id']} @@ -591,7 +591,7 @@ class Registry(APIView): req_resource = schema service = {'service_type': "image", 'interface': 'public', - 'region_id': viminfo['openstack_region_id'] + 'region_name': viminfo['openstack_region_id'] if viminfo.get('openstack_region_id') else viminfo['cloud_region_id'] } @@ -638,7 +638,7 @@ class Registry(APIView): req_resource = "/os-hypervisors/detail?hypervisor_hostname_pattern=%s" % k service = {'service_type': "compute", 'interface': 'public', - 'region_id': viminfo['openstack_region_id'] + 'region_name': viminfo['openstack_region_id'] if viminfo.get('openstack_region_id') else viminfo['cloud_region_id'] } |