From 00f43e5b2657f44771703569c49128de05b80c4f Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Fri, 28 Aug 2015 09:18:26 +1000 Subject: [PATCH] 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. 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 394968fa3d6b0f3b296b49d038aac25b74c2dca7) --- lib/neutron-legacy | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/neutron-legacy b/lib/neutron-legacy index e67bd4ae32..7d6708c337 100755 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -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"