openstack/trove
Code Issues Proposed changes

endpoint_type option not used with single tenant

Browse Source 
Currently we are not able to specify the endpoint_type
for Neutron, Nova and Cinder clients with single tenant.

publicURL is configured by default but it could be nice
to have the possibility to choose anything else.

Change-Id: Ibb791cacc0e08de2d87b4348f84c9e573849ec51
Closes-Bug: #1776229
This commit is contained in:
Gaetan Trellu 2018-06-11 09:25:47 -04:00 committed by Fan Zhang
parent 9b7c7eed20
commit dff637ad27
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/releasenotes/notes/fix-endpoint_type-option-not-used-with-single-tenant-f3e8b0f2807a026d.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
[`bug 1776229 <https://bugs.launchpad.net/trove/+bug/1776229>`_]
endpoint_type is now working with single tenant which gives the possibility
to override the publicURL value.

9
trove/common/single_tenant_remote.py
View File

@ -91,7 +91,8 @@ def nova_client_trove_admin(context, region_name=None, password=None):
session=ks_session, session=ks_session,
service_type=CONF.nova_compute_service_type, service_type=CONF.nova_compute_service_type,
region_name=region_name or CONF.os_region_name, region_name=region_name or CONF.os_region_name,
insecure=CONF.nova_api_insecure) insecure=CONF.nova_api_insecure,
endpoint_type=CONF.nova_compute_endpoint_type)
if CONF.nova_compute_url and CONF.nova_proxy_admin_tenant_id: if CONF.nova_compute_url and CONF.nova_proxy_admin_tenant_id:
client.client.endpoint_override = "%s/%s/" % ( client.client.endpoint_override = "%s/%s/" % (
@ -113,7 +114,8 @@ def cinder_client_trove_admin(context, region_name=None):
session=ks_session, session=ks_session,
service_type=CONF.cinder_service_type, service_type=CONF.cinder_service_type,
region_name=region_name or CONF.os_region_name, region_name=region_name or CONF.os_region_name,
insecure=CONF.cinder_api_insecure) insecure=CONF.cinder_api_insecure,
endpoint_type=CONF.cinder_endpoint_type)
if CONF.cinder_url and CONF.nova_proxy_admin_tenant_id: if CONF.cinder_url and CONF.nova_proxy_admin_tenant_id:
client.client.management_url = "%s/%s/" % ( client.client.management_url = "%s/%s/" % (
@ -134,7 +136,8 @@ def neutron_client_trove_admin(context, region_name=None):
session=ks_session, session=ks_session,
service_type=CONF.neutron_service_type, service_type=CONF.neutron_service_type,
region_name=region_name or CONF.os_region_name, region_name=region_name or CONF.os_region_name,
insecure=CONF.neutron_api_insecure) insecure=CONF.neutron_api_insecure,
endpoint_type=CONF.neutron_endpoint_type)
if CONF.neutron_url: if CONF.neutron_url:
client.management_url = CONF.neutron_url client.management_url = CONF.neutron_url