aboutsummaryrefslogtreecommitdiffstats
path: root/compute.yaml
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@redhat.com>2015-04-07 18:10:19 -0400
committerJeff Peeler <jpeeler@redhat.com>2015-04-09 12:02:29 -0400
commit95889dd4ee035d466eb9e5b26a1f2a75ce7847d7 (patch)
treed2f052c56e1ba2df953fcfa169e45acd5b1b219c /compute.yaml
parent0c14b2ad3e0114ffa0aa9514cdfe3dd9d9d212a8 (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 'compute.yaml')
-rw-r--r--compute.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/compute.yaml b/compute.yaml
index 3723169c..b245cc61 100644
--- a/compute.yaml
+++ b/compute.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: