From 6b03cbab118c17ac38788682527b67c6119dc83c Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 29 Mar 2017 14:48:34 -0400 Subject: Add NeutronDnsDomain heat option, undercloud fix We set dns_domain to '' in the undercloud neutron. This patch adds a new heat parameter to control the Neutron DNS setting and sets the undercloud environment default correctly for this setting. Change-Id: I794e7b88108d0d6286e5930bb5236e72ba806c3f --- puppet/services/neutron-base.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'puppet/services/neutron-base.yaml') diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 5ed54f31..e364a3aa 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -26,6 +26,10 @@ parameters: type: number default: 0 description: The number of neutron dhcp agents to schedule per network + NeutronDnsDomain: + type: string + default: openstacklocal + description: Domain to use for building the hostnames. NeutronCorePlugin: default: 'ml2' description: | @@ -91,6 +95,7 @@ outputs: neutron::debug: {get_param: Debug} neutron::purge_config: {get_param: EnableConfigPurge} neutron::allow_overlapping_ips: true + neutron::dns_domain: {get_param: NeutronDnsDomain} neutron::rabbit_heartbeat_timeout_threshold: 60 neutron::host: '%{::fqdn}' neutron::db::database_db_max_retries: -1 -- cgit 1.2.3-korg