From 0395324a3b5d921d89ef3f0cdae5629053ed008d Mon Sep 17 00:00:00 2001
From: Ben Nemec <openstack@nemebean.com>
Date: Mon, 26 Jun 2017 17:04:31 +0000
Subject: [PATCH] Revert "Default neutron's dns_domain to undercloud's domain"

Per my comment on the original change, I have concerns about
this change to the default behavior of the undercloud.  I
haven't gotten a response to my comment there (probably because
the patch is already merged), so I'm proposing that we revert
it until there is a clear path forward for making the defaults
in the overcloud templates work sanely with this.

This reverts commit 437b116e461396da1a7e94f1c6afde36cb380dae.

Change-Id: Id8e8cfd3d82fad6e31a4224a7897e932f0690ddb
---
 elements/puppet-stack-config/puppet-stack-config.pp        | 6 +-----
 .../puppet-stack-config/puppet-stack-config.yaml.template  | 4 ++--
 instack_undercloud/undercloud.py                           | 6 ++----
 .../Make-dns_domain-configurable-1411b51b65b83ded.yaml     | 7 -------
 4 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 releasenotes/notes/Make-dns_domain-configurable-1411b51b65b83ded.yaml

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 57e632392..58d605768 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -380,11 +380,9 @@ include ::nova::scheduler
 include ::nova::scheduler::filter
 include ::nova::compute
 
-$neutron_dns_domain = pick(hiera('overcloud_domain_name', $::domain), $::os_service_default)
 class { '::neutron':
   rabbit_hosts => [hiera('controller_host')],
   debug        => hiera('debug'),
-  dns_domain   => $neutron_dns_domain
 }
 
 include ::neutron::server
@@ -493,9 +491,7 @@ nova_config {
 }
 
 include ::nova::compute::ironic
-class { '::nova::network::neutron':
-  dhcp_domain => $neutron_dns_domain
-}
+include ::nova::network::neutron
 
 # Ironic
 
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 7499f10de..011ed5098 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -11,8 +11,6 @@ ntp::servers: {{UNDERCLOUD_NTP_SERVERS}}
 
 sysctl_settings: {{SYSCTL_SETTINGS}}
 
-overcloud_domain_name: {{OVERCLOUD_DOMAIN_NAME}}
-
 # SSL
 tripleo::haproxy::service_certificate: {{UNDERCLOUD_SERVICE_CERTIFICATE}}
 generate_service_certificates: {{GENERATE_SERVICE_CERTIFICATE}}
@@ -239,6 +237,7 @@ neutron::debug: "%{hiera('debug')}"
 neutron::bind_host: {{LOCAL_IP}}
 neutron::core_plugin: ml2
 neutron::dhcp_agents_per_network: 2
+neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}}
 neutron::server::api_workers: "%{::os_workers}"
 neutron::server::rpc_workers: "%{::os_workers}"
 neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
@@ -406,6 +405,7 @@ nova::api_database_connection: mysql+pymysql://nova_api:{{UNDERCLOUD_NOVA_PASSWO
 nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement
 nova::notify_on_state_change: 'vm_and_task_state'
 nova::scheduler::enabled: true
+nova::network::neutron::dhcp_domain: {{OVERCLOUD_DOMAIN_NAME}}
 nova::compute::force_config_drive: true
 nova::compute::reserved_host_memory: '0'
 nova::compute::vnc_enabled: false
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index d94e3ee5d..89020f68d 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -156,12 +156,10 @@ _opts = [
                 default=[],
                 help=('List of ntp servers to use.')),
     cfg.StrOpt('overcloud_domain_name',
-               default='',
+               default='localdomain',
                help=('DNS domain name to use when deploying the overcloud. '
                      'The overcloud parameter "CloudDomain" must be set to a '
-                     'matching value. When unset, the installation will try '
-                     'to use the undercloud\'s domain name, and if that fails '
-                     'it\'ll use the default from neutron.conf.')
+                     'matching value.')
                ),
     cfg.StrOpt('undercloud_service_certificate',
                default='',
diff --git a/releasenotes/notes/Make-dns_domain-configurable-1411b51b65b83ded.yaml b/releasenotes/notes/Make-dns_domain-configurable-1411b51b65b83ded.yaml
deleted file mode 100644
index 40843dc65..000000000
--- a/releasenotes/notes/Make-dns_domain-configurable-1411b51b65b83ded.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-features:
-  - the dns_domain parameter in neutron.conf is now configurable through the
-    overcloud_domain_name configuration parameter in undercloud.conf. In the
-    absence of this parameter, the installation will try to use the domain
-    from the undercloud, and if this fails, it will then just use the default
-    from neutron.conf.