Description of problem:

director create neutron_admin_auth_url with NeutronAdmin in manila.conf.
NeutronAdmin url doest not match this auth url.

Version-Release number of selected component (if applicable):


How reproducible:

This symptom is default in RHOSP10

Steps to Reproduce:
1.
2.
3.

Actual results:
# cat /etc/manila/manila.conf
...
network_api_class = manila.network.neutron.neutron_network_plugin.NeutronNetworkPlugin
neutron_api_insecure=False
neutron_auth_strategy=keystone
neutron_admin_tenant_name=service
neutron_url=http://10.1.70.10:9696
neutron_admin_password=HYZBsT2BE6cGcT3kc7kuEkp7j
neutron_admin_username=neutron
neutron_admin_auth_url=http://10.1.70.10:9696 <-- this is invalid config
neutron_url_timeout=30
...

Working configuration edited as below.
network_api_class = manila.network.neutron.neutron_network_plugin.NeutronNetworkPlugin
neutron_api_insecure=False
neutron_auth_strategy=keystone
neutron_admin_tenant_name=service
neutron_url=http://10.1.76.10:9696
neutron_admin_password=HYZBsT2BE6cGcT3kc7kuEkp7j
neutron_admin_username=neutron
neutron_admin_auth_url=http://10.1.70.10:5000/v2.0 <-- this is correct
neutron_url_timeout=30

Expected results:

neutron_admin_auth_url will be KeystoneInternal in /usr/share/openstack-tripleo-heat-templates/puppet/services/manila-scheduler.yaml


- manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, NeutronAdmin, uri]}
+ manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
Additional info: