From a5a6f595ce5f92a9baf2c613fce75aad1758bf08 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Fri, 17 Jun 2016 10:26:15 +0100
Subject: [PATCH] Add authentication details to neutron section

For newton, the authentication details for keystone must be passed
in the neutron section, rather than referring to the keystone_authtoken
section as done before.

This should work on mitaka as well, so update the mitaka template to
take this approach, supporting newton as well.

Change-Id: Ie175be5aa257d96253b496fa467968d6c50548d6
---
 templates/mitaka/nova.conf | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf
index c4f76040..17ce78a4 100644
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -128,8 +128,16 @@ url = {{ network_manager_config.neutron_url }}
 {% if neutron_plugin and neutron_plugin == 'vsp' -%}
 ovs_bridge = alubr0
 {% endif -%}
-auth_section = keystone_authtoken
-auth_plugin = password
+{% if auth_host -%}
+auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
+auth_type = password
+project_domain_name = default
+user_domain_name = default
+project_name = {{ admin_tenant_name }}
+username = {{ admin_user }}
+password = {{ admin_password }}
+signing_dir = {{ signing_dir }}
+{% endif -%}
 {% if metadata_shared_secret -%}
 metadata_proxy_shared_secret = {{ metadata_shared_secret }}
 service_metadata_proxy=True