Skip to content

Commit 394968f

Browse files
author
Jamie Lennox
committed
Always use v3 nova/neutron authentication
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. Change-Id: I0d2d76ebdf261917f1a2b23c65f0f843ae50f49a
1 parent 188b38f commit 394968f

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

‎lib/neutron-legacy‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -468,19 +468,13 @@ function configure_neutron {
468468
function create_nova_conf_neutron {
469469
iniset $NOVA_CONF DEFAULT network_api_class "nova.network.neutronv2.api.API"
470470

471-
472-
if [ "$ENABLE_IDENTITY_V2" == "False" ]; then
473-
iniset $NOVA_CONF neutron auth_plugin "v3password"
474-
iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
475-
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME"
476-
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"
477-
iniset $NOVA_CONF neutron user_domain_name "default"
478-
else
479-
iniset $NOVA_CONF neutron admin_username "$Q_ADMIN_USERNAME"
480-
iniset $NOVA_CONF neutron admin_password "$SERVICE_PASSWORD"
481-
iniset $NOVA_CONF neutron admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0"
482-
iniset $NOVA_CONF neutron admin_tenant_name "$SERVICE_TENANT_NAME"
483-
fi
471+
iniset $NOVA_CONF neutron auth_plugin "v3password"
472+
iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
473+
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME"
474+
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"
475+
iniset $NOVA_CONF neutron user_domain_name "Default"
476+
iniset $NOVA_CONF neutron project_name "$SERVICE_TENANT_NAME"
477+
iniset $NOVA_CONF neutron project_domain_name "Default"
484478
iniset $NOVA_CONF neutron auth_strategy "$Q_AUTH_STRATEGY"
485479
iniset $NOVA_CONF neutron region_name "$REGION_NAME"
486480
iniset $NOVA_CONF neutron url "${Q_PROTOCOL}://$Q_HOST:$Q_PORT"

0 commit comments

Comments
 (0)