x/vmtp
Code Issues Proposed changes

Make clients use OS_REGION_NAME when talking to the endpoints

Browse Source 
Change-Id: Ice97429e39a1cc2dd71e3844fe4e212f7a464017
This commit is contained in:
Jinay Vora 2016-08-03 20:22:22 -04:00
parent a4c8d50f19
commit 3a33e062fb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmtp/credentials.py
View File

@ -30,6 +30,7 @@ class Credentials(object):
dct['tenant_name'] = self.rc_tenant_name dct['tenant_name'] = self.rc_tenant_name
dct['cacert'] = self.rc_cacert dct['cacert'] = self.rc_cacert
dct['ca_cert'] = self.rc_cacert dct['ca_cert'] = self.rc_cacert
dct['region_name'] = self.rc_region_name
return dct return dct
def get_nova_credentials(self): def get_nova_credentials(self):
@ -39,6 +40,7 @@ class Credentials(object):
dct['auth_url'] = self.rc_auth_url dct['auth_url'] = self.rc_auth_url
dct['project_id'] = self.rc_tenant_name dct['project_id'] = self.rc_tenant_name
dct['cacert'] = self.rc_cacert dct['cacert'] = self.rc_cacert
dct['region_name'] = self.rc_region_name
return dct return dct
def get_nova_credentials_v2(self): def get_nova_credentials_v2(self):
@ -56,6 +58,7 @@ class Credentials(object):
self.rc_tenant_name = None self.rc_tenant_name = None
self.rc_auth_url = None self.rc_auth_url = None
self.rc_cacert = None self.rc_cacert = None
self.rc_region_name = None
success = True success = True
if openrc_file: if openrc_file:
@ -86,6 +89,8 @@ class Credentials(object):
self.rc_tenant_name = value self.rc_tenant_name = value
elif name == "CACERT": elif name == "CACERT":
self.rc_cacert = value self.rc_cacert = value
elif name == "REGION_NAME":
self.rc_region_name = value
else: else:
LOG.error('Error: rc file does not exist %s', openrc_file) LOG.error('Error: rc file does not exist %s', openrc_file)
success = False success = False
@ -103,6 +108,8 @@ class Credentials(object):
self.rc_tenant_name = os.environ['OS_TENANT_NAME'] self.rc_tenant_name = os.environ['OS_TENANT_NAME']
if 'OS_CACERT' in os.environ: if 'OS_CACERT' in os.environ:
self.rc_cacert = os.environ['OS_CACERT'] self.rc_cacert = os.environ['OS_CACERT']
if 'OS_REGION_NAME' in os.environ:
self.rc_region_name = os.environ['OS_REGION_NAME']
# always override with CLI argument if provided # always override with CLI argument if provided
if pwd: if pwd: