diff options
| author |   Dan Prince <dprince@redhat.com> | 2017-03-29 14:48:34 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-03-29 14:48:34 -0400 |
| commit | 6b03cbab118c17ac38788682527b67c6119dc83c (patch) | |
| tree | 019566d83af220294dd444714d8278ec1b9bedbd | |
| parent | 0ae9d9b346f1c5d7e29b8f281474577eca260670 (diff) | |
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
| -rw-r--r-- | environments/undercloud.yaml | 1 | ||||
| -rw-r--r-- | puppet/services/neutron-base.yaml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 2540fbe5..7a2716da 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -11,6 +11,7 @@ parameter_defaults: NeutronBridgeMappings: ctlplane:br-ctlplane NeutronAgentExtensions: [] NeutronFlatNetworks: '*' + NeutronDnsDomain: '' NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters' NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter'] NeutronDhcpAgentsPerNetwork: 2 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 |