From ee0378463808105f7200a58746eccb9d48ab58ac Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Wed, 28 Nov 2018 09:55:50 -0800
Subject: [PATCH] Set dhcp_domain for nova-metadata-api

For guest operating systems that rely on nova metadata rather than dhcp
offers for host dns domain settings it is necessary to set dhcp_domain
in the nova.conf.

Change-Id: If7de988ddcd8817d02b261bea601d6922275890c
Partial-Bug: #1805645
---
 templates/mitaka/nova.conf | 6 ++++++
 templates/newton/nova.conf | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf
index 1ee18601..0f697194 100644
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -23,6 +23,12 @@ vendordata_driver = nova.api.metadata.vendordata_json.JsonFileVendorData
 vendordata_jsonfile_path = /etc/nova/vendor_data.json
 {% endif -%}
 
+{% if dns_domain -%}
+# Per LP#1805645, dhcp_domain needs to be configured for nova-metadata-api
+# It gets this information from neutron.
+dhcp_domain = {{ dns_domain }}
+{% endif -%}
+
 [neutron]
 url={{ quantum_url }}
 auth_url={{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}
diff --git a/templates/newton/nova.conf b/templates/newton/nova.conf
index 8c6eb8d0..22ad7627 100644
--- a/templates/newton/nova.conf
+++ b/templates/newton/nova.conf
@@ -29,6 +29,12 @@ vendordata_dynamic_targets = {{ vendor_data_url }}
 {% endif -%}
 {% endif -%}
 
+{% if dns_domain -%}
+# Per LP#1805645, dhcp_domain needs to be configured for nova-metadata-api
+# It gets this information from neutron.
+dhcp_domain = {{ dns_domain }}
+{% endif -%}
+
 [neutron]
 url={{ quantum_url }}
 auth_url={{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}