From d6456e67589a78f50f71e93fd789c1423513ab60 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Wed, 19 Aug 2015 10:33:23 -0400
Subject: [PATCH] Ability to specify keystone v3 in nova.conf for neutron

As part of moving components to use keystone v3, this review
allows nova.conf's [neutron] section to switch to using the
auth_plugin in keystoneclient for talking to keystone /v3 API

Change-Id: I42502bff147534199096fb581630b8559f311963
---
 lib/neutron-legacy | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 9206fe1754..c4d2dd5f7e 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -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"