From 802f607b8c0f9dc20703b0eac9706431fc2f08bc Mon Sep 17 00:00:00 2001 From: James Page Date: Mon, 19 Mar 2018 14:24:05 +0000 Subject: [PATCH] Switch keystone authentication calls to admin ep Ensure that the keystone admin endpoint is used for calls to keystone, resolving issues when the public ep is not network accessible from the neutron-gateway units. Change-Id: I79a1183e7eddd4981367baf4a22fe2ec6374b0b9 Closes-Bug: 1756111 --- templates/icehouse/l3_agent.ini | 2 +- templates/icehouse/metadata_agent.ini | 2 +- templates/icehouse/nova.conf | 2 +- templates/juno/l3_agent.ini | 2 +- templates/kilo/nova.conf | 2 +- templates/mitaka/l3_agent.ini | 2 +- templates/mitaka/nova.conf | 2 +- templates/newton/l3_agent.ini | 2 +- tests/basic_deployment.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/icehouse/l3_agent.ini b/templates/icehouse/l3_agent.ini index 8a34af01..0f5de24e 100644 --- a/templates/icehouse/l3_agent.ini +++ b/templates/icehouse/l3_agent.ini @@ -4,7 +4,7 @@ ############################################################################### [DEFAULT] interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver -auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 +auth_url = {{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}/v2.0 auth_region = {{ region }} admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} diff --git a/templates/icehouse/metadata_agent.ini b/templates/icehouse/metadata_agent.ini index a6edb87d..4f788b21 100644 --- a/templates/icehouse/metadata_agent.ini +++ b/templates/icehouse/metadata_agent.ini @@ -5,7 +5,7 @@ # Metadata service seems to cache neutron api url from keystone so trigger # restart if it changes: {{ quantum_url }} [DEFAULT] -auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 +auth_url = {{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}/v2.0 auth_region = {{ region }} admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} diff --git a/templates/icehouse/nova.conf b/templates/icehouse/nova.conf index 82761f21..cecf9b98 100644 --- a/templates/icehouse/nova.conf +++ b/templates/icehouse/nova.conf @@ -25,4 +25,4 @@ neutron_url={{ quantum_url }} neutron_admin_tenant_name={{ service_tenant }} neutron_admin_username={{ service_username }} neutron_admin_password={{ service_password }} -neutron_admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 +neutron_admin_auth_url={{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}/v2.0 diff --git a/templates/juno/l3_agent.ini b/templates/juno/l3_agent.ini index b0f5d696..6376978b 100644 --- a/templates/juno/l3_agent.ini +++ b/templates/juno/l3_agent.ini @@ -4,7 +4,7 @@ ############################################################################### [DEFAULT] interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver -auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 +auth_url = {{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}/v2.0 auth_region = {{ region }} admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf index fe44fd4d..f4473c71 100644 --- a/templates/kilo/nova.conf +++ b/templates/kilo/nova.conf @@ -23,7 +23,7 @@ url={{ quantum_url }} admin_tenant_name={{ service_tenant }} admin_username={{ service_username }} admin_password={{ service_password }} -admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 +admin_auth_url={{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}/v2.0 service_metadata_proxy=True metadata_proxy_shared_secret={{ shared_secret }} diff --git a/templates/mitaka/l3_agent.ini b/templates/mitaka/l3_agent.ini index 6c954e8d..2342e869 100644 --- a/templates/mitaka/l3_agent.ini +++ b/templates/mitaka/l3_agent.ini @@ -4,7 +4,7 @@ ############################################################################### [DEFAULT] interface_driver = openvswitch -auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 +auth_url = {{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}/v2.0 auth_region = {{ region }} admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf index 6753ea4f..d7ab35c4 100644 --- a/templates/mitaka/nova.conf +++ b/templates/mitaka/nova.conf @@ -20,7 +20,7 @@ metadata_workers = {{ workers }} [neutron] url={{ quantum_url }} -auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }} +auth_url={{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }} auth_type=password project_domain_name=default user_domain_name=default diff --git a/templates/newton/l3_agent.ini b/templates/newton/l3_agent.ini index 5aecdc58..27d06c3c 100644 --- a/templates/newton/l3_agent.ini +++ b/templates/newton/l3_agent.ini @@ -5,7 +5,7 @@ ############################################################################### [DEFAULT] interface_driver = openvswitch -auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 +auth_url = {{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}/v2.0 auth_region = {{ region }} admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 93470139..e1e79481 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -790,7 +790,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): 'quantum-network-service', 'neutron-gateway:quantum-network-service') ep = self.keystone.service_catalog.url_for(service_type='identity', - interface='publicURL') + interface='adminURL') expected = { 'DEFAULT': {