From 95889dd4ee035d466eb9e5b26a1f2a75ce7847d7 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 7 Apr 2015 18:10:19 -0400 Subject: 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 --- compute.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compute.yaml') 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: -- cgit 1.2.3-korg