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/159308 /git.openstack. org/cgit/ openstack/ horizon/ commit/ ?id=8d3c2baa5b6 f9ad22a398430c6 8ecfe54d6f4edc
Committed: https:/
Submitter: Jenkins
Branch: master
commit 8d3c2baa5b6f9ad 22a398430c68ecf e54d6f4edc
Author: lin-hua-cheng <email address hidden>
Date: Wed Feb 25 16:51:28 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: I9e027586847b7b 7c0276e8c3ff6b7 3f06a32e2a5
Closes-Bug: #1424825