From dff637ad274a73e8756d67ce0fad01360a2c2828 Mon Sep 17 00:00:00 2001 From: Gaetan Trellu Date: Mon, 11 Jun 2018 09:25:47 -0400 Subject: [PATCH] endpoint_type option not used with single tenant 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 --- ...ion-not-used-with-single-tenant-f3e8b0f2807a026d.yaml | 6 ++++++ trove/common/single_tenant_remote.py | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/releasenotes/notes/fix-endpoint_type-option-not-used-with-single-tenant-f3e8b0f2807a026d.yaml diff --git a/releasenotes/notes/releasenotes/notes/fix-endpoint_type-option-not-used-with-single-tenant-f3e8b0f2807a026d.yaml b/releasenotes/notes/releasenotes/notes/fix-endpoint_type-option-not-used-with-single-tenant-f3e8b0f2807a026d.yaml new file mode 100644 index 0000000000..460e43a7ad --- /dev/null +++ b/releasenotes/notes/releasenotes/notes/fix-endpoint_type-option-not-used-with-single-tenant-f3e8b0f2807a026d.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + [`bug 1776229 `_] + endpoint_type is now working with single tenant which gives the possibility + to override the publicURL value. diff --git a/trove/common/single_tenant_remote.py b/trove/common/single_tenant_remote.py index f1c8421b84..74dec1bedc 100644 --- a/trove/common/single_tenant_remote.py +++ b/trove/common/single_tenant_remote.py @@ -91,7 +91,8 @@ def nova_client_trove_admin(context, region_name=None, password=None): session=ks_session, service_type=CONF.nova_compute_service_type, 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: client.client.endpoint_override = "%s/%s/" % ( @@ -113,7 +114,8 @@ def cinder_client_trove_admin(context, region_name=None): session=ks_session, service_type=CONF.cinder_service_type, 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: client.client.management_url = "%s/%s/" % ( @@ -134,7 +136,8 @@ def neutron_client_trove_admin(context, region_name=None): session=ks_session, service_type=CONF.neutron_service_type, 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: client.management_url = CONF.neutron_url