openstack
/
charm-neutron-gateway
Code Issues Proposed changes

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
This commit is contained in:
James Page 2018-03-19 14:24:05 +00:00
parent bbf704cbfd
commit 802f607b8c
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/icehouse/l3_agent.ini
View File

@ -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 }}

2
templates/icehouse/metadata_agent.ini
View File

@ -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 }}

2
templates/icehouse/nova.conf
View File

@ -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

2
templates/juno/l3_agent.ini
View File

@ -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 }}

2
templates/kilo/nova.conf
View File

@ -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 }}

2
templates/mitaka/l3_agent.ini
View File

@ -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 }}

2
templates/mitaka/nova.conf
View File

@ -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

2
templates/newton/l3_agent.ini
View File

@ -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 }}

2
tests/basic_deployment.py
View File

@ -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': {