From 95889dd4ee035d466eb9e5b26a1f2a75ce7847d7 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@redhat.com>
Date: Tue, 7 Apr 2015 18:10:19 -0400
Subject: [PATCH] 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
---
 cinder-storage.yaml               | 4 ++--
 compute.yaml                      | 4 ++--
 controller.yaml                   | 4 ++--
 puppet/cinder-storage-puppet.yaml | 4 ++--
 puppet/compute-puppet.yaml        | 6 +++---
 puppet/controller-puppet.yaml     | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index 7eab89a6..3a938498 100644
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -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
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:
diff --git a/controller.yaml b/controller.yaml
index 33286d19..9fc71166 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -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'
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml
index c7fd2ca0..f99bd4da 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@ -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
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:
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 3c299895..7f832931 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -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'
-- 
2.16.6