aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-21 00:08:08 +0000
committerGerrit Code Review <review@openstack.org>2017-04-21 00:08:09 +0000
commitc1d88987f366706384ebf5b2dddf1d50109ca710 (patch)
tree54d51db084d17664f2c1e3d09d95ccffe0469bd7 /environments
parent4afd65f4867faeeb6c9749be6fc496cd6d5ad990 (diff)
parent6b03cbab118c17ac38788682527b67c6119dc83c (diff)
Merge "Add NeutronDnsDomain heat option, undercloud fix"
Diffstat (limited to 'environments')
-rw-r--r--environments/undercloud.yaml1
1 files changed, 1 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