@@ -471,11 +471,21 @@ function configure_neutron {

 function create_nova_conf_neutron {

     iniset $NOVA_CONF DEFAULT network_api_class "nova.network.neutronv2.api.API"

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

+

+

+    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_strategy "$Q_AUTH_STRATEGY"

-    iniset $NOVA_CONF neutron admin_tenant_name "$SERVICE_TENANT_NAME"

     iniset $NOVA_CONF neutron region_name "$REGION_NAME"

     iniset $NOVA_CONF neutron url "${Q_PROTOCOL}://$Q_HOST:$Q_PORT"