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
This commit is contained in:
Jeff Peeler 2015-04-07 18:10:19 -04:00
parent 0c14b2ad3e
commit 95889dd4ee
6 changed files with 13 additions and 13 deletions

@ -71,10 +71,10 @@ parameters:
description: Name of an existing EC2 KeyPair to enable SSH access to the instances
type: string
RabbitPassword:
default: ''
default: 'guest'
type: string
RabbitUserName:
default: ''
default: 'guest'
type: string
RabbitClientUseSSL:
default: false

@ -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:

@ -204,7 +204,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.
@ -240,7 +240,7 @@ parameters:
default: "True"
NeutronFlatNetworks:
type: string
default: ''
default: 'datacentre'
description: If set, flat networks to configure in neutron plugins.
NeutronNetworkType:
default: 'gre'

@ -75,10 +75,10 @@ parameters:
description: Name of an existing EC2 KeyPair to enable SSH access to the instances
type: string
RabbitPassword:
default: ''
default: 'guest'
type: string
RabbitUserName:
default: ''
default: 'guest'
type: string
RabbitClientUseSSL:
default: false

@ -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:

@ -204,7 +204,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.
@ -240,7 +240,7 @@ parameters:
default: "True"
NeutronFlatNetworks:
type: string
default: ''
default: 'datacentre'
description: If set, flat networks to configure in neutron plugins.
NeutronL3HA:
default: 'False'