diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-04-27 14:21:00 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-04-27 14:21:00 +0000 |
commit | 645b447b86ef9dbc37c46958b3e08b3ac65e3762 (patch) | |
tree | 1f9d187a131812f59142afdd7f36f5d49475011a /puppet/controller-puppet.yaml | |
parent | 476a1b347d85c5fb119d428159e9dcd498f0bbd3 (diff) | |
parent | 95889dd4ee035d466eb9e5b26a1f2a75ce7847d7 (diff) |
Merge "Make all default values match overcloud defaults"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r-- | puppet/controller-puppet.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 9ecce0e1..4e04eb0e 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -221,7 +221,7 @@ parameters: network) - if changing this either use different post-install network scripts or be sure to keep 'datacentre' as a mapping network name. type: string - default: "" + default: "datacentre:br-ex" NeutronDnsmasqOptions: default: 'dhcp-option-force=26,1400' description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead. @@ -257,7 +257,7 @@ parameters: default: "True" NeutronFlatNetworks: type: string - default: '' + default: 'datacentre' description: If set, flat networks to configure in neutron plugins. NeutronL3HA: default: 'False' |