From 510af24ed73f6f2bf2157a85559aba4c5cea96c7 Mon Sep 17 00:00:00 2001
From: Billy Olsen <billy.olsen@gmail.com>
Date: Mon, 13 Nov 2017 16:38:56 -0700
Subject: [PATCH] Add missing dns_domain to pike's neutron.conf template

Neutron ML2 DNS integration was broken in pike deployments due
to the dns_domain name not changing from the default openstacklocal.
This change adds the dns_domain option into the neutron.conf file.

Change-Id: I9ea25ab7f1a30a1a172d0d33c4d408712b66de0a
Closes-Bug: 1732042
---
 templates/pike/neutron.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/pike/neutron.conf b/templates/pike/neutron.conf
index 263414b6..44f1e6bf 100644
--- a/templates/pike/neutron.conf
+++ b/templates/pike/neutron.conf
@@ -16,6 +16,10 @@ rpc_workers = {{ workers }}
 
 router_distributed = {{ enable_dvr }}
 
+{% if dns_domain -%}
+dns_domain = {{ dns_domain }}
+{% endif -%}
+
 l3_ha = {{ l3_ha }}
 {% if l3_ha -%}
 max_l3_agents_per_router = {{ max_l3_agents_per_router }}