Don't assume that the service catalog is well-formed, added code
to safely parsing the catalog.
Parsing of region from service catalog has been fixed as well.
'region' has been deprecated in the Keystone V3 catalog in favor of
'region_id'. Fix how region is extracted by checking 'region_id' then
fallback to 'region'.
Reviewed: https:/ /review. openstack. org/159303 /git.openstack. org/cgit/ openstack/ django_ openstack_ auth/commit/ ?id=7ec44e898b0 8dc57e231d78465 d9d242f2058d77
Committed: https:/
Submitter: Jenkins
Branch: master
commit 7ec44e898b08dc5 7e231d78465d9d2 42f2058d77
Author: lin-hua-cheng <email address hidden>
Date: Wed Feb 25 16:33:22 2015 -0800
Updated parsing of catalog to handle bad format
Don't assume that the service catalog is well-formed, added code
to safely parsing the catalog.
Parsing of region from service catalog has been fixed as well.
'region' has been deprecated in the Keystone V3 catalog in favor of
'region_id'. Fix how region is extracted by checking 'region_id' then
fallback to 'region'.
Change-Id: I7b649a8b90e20c aa2d04fdd3f79b5 b1ac775237c
Closes-Bug: #1424825