openstack/tripleo-heat-templates
Code Issues Proposed changes

Add NeutronDnsDomain heat option, undercloud fix

Browse Source 
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
This commit is contained in:
Dan Prince 2017-03-29 14:48:34 -04:00
parent 0ae9d9b346
commit 6b03cbab11
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/undercloud.yaml
View File

@ -11,6 +11,7 @@ parameter_defaults:
NeutronBridgeMappings: ctlplane:br-ctlplane NeutronBridgeMappings: ctlplane:br-ctlplane
NeutronAgentExtensions: [] NeutronAgentExtensions: []
NeutronFlatNetworks: '*' NeutronFlatNetworks: '*'
NeutronDnsDomain: ''
NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters' NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter'] NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
NeutronDhcpAgentsPerNetwork: 2 NeutronDhcpAgentsPerNetwork: 2

5
puppet/services/neutron-base.yaml
View File

@ -26,6 +26,10 @@ parameters:
type: number type: number
default: 0 default: 0
description: The number of neutron dhcp agents to schedule per network 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: NeutronCorePlugin:
default: 'ml2' default: 'ml2'
description: | description: |
@ -91,6 +95,7 @@ outputs:
neutron::debug: {get_param: Debug} neutron::debug: {get_param: Debug}
neutron::purge_config: {get_param: EnableConfigPurge} neutron::purge_config: {get_param: EnableConfigPurge}
neutron::allow_overlapping_ips: true neutron::allow_overlapping_ips: true
neutron::dns_domain: {get_param: NeutronDnsDomain}
neutron::rabbit_heartbeat_timeout_threshold: 60 neutron::rabbit_heartbeat_timeout_threshold: 60
neutron::host: '%{::fqdn}' neutron::host: '%{::fqdn}'
neutron::db::database_db_max_retries: -1 neutron::db::database_db_max_retries: -1