openstack/devstack
Code Issues Proposed changes

Always use v3 nova/neutron authentication

Browse Source 
There is no need to test here whether v2 is disabled or not. V3
Authentication will always be available and we should just use that.

This backport is needed as the options used were deprecated in liberty already, and this is breaking grenade jobs.

Change-Id: I0d2d76ebdf261917f1a2b23c65f0f843ae50f49a
(cherry picked from commit 394968fa3d)
This commit is contained in:
Jamie Lennox
2015-08-28 09:18:26 +10:00
committed by Thomas Herve
parent 6313bf8452
commit 00f43e5b26
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/neutron-legacy
View File

@@ -468,19 +468,13 @@ function configure_neutron {
function create_nova_conf_neutron {
iniset $NOVA_CONF DEFAULT network_api_class "nova.network.neutronv2.api.API"
if [ "$ENABLE_IDENTITY_V2" == "False" ]; then
iniset $NOVA_CONF neutron auth_plugin "v3password"
iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME"
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"
iniset $NOVA_CONF neutron user_domain_name "default"
else
iniset $NOVA_CONF neutron admin_username "$Q_ADMIN_USERNAME"
iniset $NOVA_CONF neutron admin_password "$SERVICE_PASSWORD"
iniset $NOVA_CONF neutron admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0"
iniset $NOVA_CONF neutron admin_tenant_name "$SERVICE_TENANT_NAME"
fi
iniset $NOVA_CONF neutron auth_plugin "v3password"
iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME"
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"
iniset $NOVA_CONF neutron user_domain_name "Default"
iniset $NOVA_CONF neutron project_name "$SERVICE_TENANT_NAME"
iniset $NOVA_CONF neutron project_domain_name "Default"
iniset $NOVA_CONF neutron auth_strategy "$Q_AUTH_STRATEGY"
iniset $NOVA_CONF neutron region_name "$REGION_NAME"
iniset $NOVA_CONF neutron url "${Q_PROTOCOL}://$Q_HOST:$Q_PORT"