diff options
author | Jeff Peeler <jpeeler@redhat.com> | 2015-04-07 18:10:19 -0400 |
---|---|---|
committer | Jeff Peeler <jpeeler@redhat.com> | 2015-04-09 12:02:29 -0400 |
commit | 95889dd4ee035d466eb9e5b26a1f2a75ce7847d7 (patch) | |
tree | d2f052c56e1ba2df953fcfa169e45acd5b1b219c /puppet/compute-puppet.yaml | |
parent | 0c14b2ad3e0114ffa0aa9514cdfe3dd9d9d212a8 (diff) |
Make all default values match overcloud defaults
It's very confusing for them to be different, especially in the case of
comparing Tuskar vs non-Tuskar deployments where the parameters are read
from different files.
Note: NeutronPhysicalBridge is named differently in the overcloud
template (HypervisorNeutronPhysicalBridge). This is the only parameter
checked that isn't named exactly the same, hopefully there aren't any
others.
(Checked controller, compute, ceph, cinder, and swift for both puppet
and non-puppet templates)
Change-Id: I48ce1eb40d2d080c589ce619c50eddff17efe882
Diffstat (limited to 'puppet/compute-puppet.yaml')
-rw-r--r-- | puppet/compute-puppet.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index 382a6b53..7352b0e1 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -110,13 +110,13 @@ 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" NeutronEnableTunnelling: type: string default: "True" NeutronFlatNetworks: type: string - default: '' + default: 'datacentre' description: > If set, flat networks to configure in neutron plugins. NeutronHost: @@ -139,7 +139,7 @@ parameters: type: string hidden: true NeutronPhysicalBridge: - default: '' + default: 'br-ex' description: An OVS bridge to create for accessing external networks. type: string NeutronPublicInterface: |