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 /windriver | |
| 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 'windriver')
| -rw-r--r-- | windriver/titanium_cloud/resource/views/capacity.py | 2 | ||||
| -rw-r--r-- | windriver/titanium_cloud/vesagent/event_domain/fault_vm.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/windriver/titanium_cloud/resource/views/capacity.py b/windriver/titanium_cloud/resource/views/capacity.py index 0619e83b..25b29da8 100644 --- a/windriver/titanium_cloud/resource/views/capacity.py +++ b/windriver/titanium_cloud/resource/views/capacity.py @@ -54,7 +54,7 @@ class CapacityCheck(APIView): interface = 'public' service = {'service_type': 'compute', 'interface': interface, - 'region_id': vim['openstack_region_id'] + 'region_name': vim['openstack_region_id'] if vim.get('openstack_region_id') else vim['cloud_region_id'] } diff --git a/windriver/titanium_cloud/vesagent/event_domain/fault_vm.py b/windriver/titanium_cloud/vesagent/event_domain/fault_vm.py index 9b6d0224..c3f878e3 100644 --- a/windriver/titanium_cloud/vesagent/event_domain/fault_vm.py +++ b/windriver/titanium_cloud/vesagent/event_domain/fault_vm.py @@ -22,6 +22,7 @@ import time from django.conf import settings from titanium_cloud.vesagent.vespublish import publishAnyEventToVES from common.utils import restcall +from common.msapi.helper import Helper as helper import datetime import time |