From 74161785a2023706ce19efab5dc47aa2c1d5b6e2 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 27 Sep 2018 09:21:07 +0100
Subject: [PATCH] rocky: resolve issues with live migration

Add requires keystone access and authentication details, resolving
issues with live migration @ rocky.

Change-Id: Ic99d841b4a69f6ce5d26fe081f8abf70d105c113
Closes-Bug: 1794697
---
 templates/pike/nova.conf | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/templates/pike/nova.conf b/templates/pike/nova.conf
index 7ebc0c54..1173fb29 100644
--- a/templates/pike/nova.conf
+++ b/templates/pike/nova.conf
@@ -129,9 +129,21 @@ api_servers = {{ glance_api_servers }}
 {% if network_manager and network_manager == 'neutron' -%}
 [neutron]
 url = {{ neutron_url }}
-auth_strategy = keystone
-auth_section = keystone_authtoken
+{% if auth_host -%}
+auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
 auth_type = password
+{% if admin_domain_name -%}
+project_domain_name = {{ admin_domain_name }}
+user_domain_name = {{ admin_domain_name }}
+{% else -%}
+project_domain_name = default
+user_domain_name = default
+{% endif -%}
+project_name = {{ admin_tenant_name }}
+username = {{ admin_user }}
+password = {{ admin_password }}
+signing_dir = {{ signing_dir }}
+{% endif -%}
 {% endif -%}
 
 {% include "section-keystone-authtoken-mitaka" %}