From 5bc84d64192720b2944d32acd8dd44289bdab859 Mon Sep 17 00:00:00 2001
From: David Hill <dhill@redhat.com>
Date: Wed, 25 Sep 2019 15:38:38 -0400
Subject: [PATCH] Add dns_domain support to OS::Neutron::ProviderNet

It is actually possible to set OS::Neutron::Net-dns_domain but
not OS::Neutron::ProviderNet-dns_domain with heat.   Since this
is allowed using python-neutronclient, there're no reasons to
not allow this using heat.

Change-Id: I5b085e469f3fd24c797d5dcaf39dbe56f6ad5cdf
Task: 36808
---
 .../resources/openstack/neutron/provider_net.py     | 13 +++++++++++--
 ...-dns_domain-to-ProviderNet-84b14a85b8653c7c.yaml |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/add-dns_domain-to-ProviderNet-84b14a85b8653c7c.yaml

diff --git a/heat/engine/resources/openstack/neutron/provider_net.py b/heat/engine/resources/openstack/neutron/provider_net.py
index 342e9c3e4d..936aa5381d 100644
--- a/heat/engine/resources/openstack/neutron/provider_net.py
+++ b/heat/engine/resources/openstack/neutron/provider_net.py
@@ -37,11 +37,11 @@ class ProviderNet(net.Net):
     PROPERTIES = (
         NAME, PROVIDER_NETWORK_TYPE, PROVIDER_PHYSICAL_NETWORK,
         PROVIDER_SEGMENTATION_ID, ADMIN_STATE_UP, SHARED,
-        PORT_SECURITY_ENABLED, ROUTER_EXTERNAL, TAGS,
+        PORT_SECURITY_ENABLED, ROUTER_EXTERNAL, DNS_DOMAIN, TAGS,
     ) = (
         'name', 'network_type', 'physical_network',
         'segmentation_id', 'admin_state_up', 'shared',
-        'port_security_enabled', 'router_external', 'tags',
+        'port_security_enabled', 'router_external', 'dns_domain', 'tags',
 
     )
 
@@ -110,6 +110,15 @@ class ProviderNet(net.Net):
             update_allowed=True,
             support_status=support.SupportStatus(version='12.0.0')
         ),
+        DNS_DOMAIN: properties.Schema(
+            properties.Schema.STRING,
+            _('DNS domain associated with this network.'),
+            constraints=[
+                constraints.CustomConstraint('dns_domain')
+            ],
+            update_allowed=True,
+            support_status=support.SupportStatus(version='14.0.0')
+        ),
     }
 
     attributes_schema = {
diff --git a/releasenotes/notes/add-dns_domain-to-ProviderNet-84b14a85b8653c7c.yaml b/releasenotes/notes/add-dns_domain-to-ProviderNet-84b14a85b8653c7c.yaml
new file mode 100644
index 0000000000..c654b5c439
--- /dev/null
+++ b/releasenotes/notes/add-dns_domain-to-ProviderNet-84b14a85b8653c7c.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added ``dns_domain`` property to resource type
+    ``OS::Neutron::ProviderNet``. This specifies the DNS domain to use when
+    publishing DNS records for ports on this network.