From: Ryan Brady <rbrady@redhat.com>
Date: Wed, 12 Mar 2014 00:06:54 +0000 (-0400)
Subject: Remove Duplicate Rabbit Parameters
X-Git-Tag: opnfv-6.0.0~2861^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=640f7e2d8b6a2d43fa5e04c7424d98e508d317e4;p=apex-tripleo-heat-templates.git

Remove Duplicate Rabbit Parameters

This patch removes the duplicate rabbit username and password
parameters.  These parameters cause a conflict when running
merge.py because they already exist in the overcloud template.

Change-Id: I01d386577734c7c516a477e1e402882294ac4376
---

diff --git a/block-storage.yaml b/block-storage.yaml
index c801040f..8508e1f1 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -4,13 +4,6 @@ Parameters:
   BlockStorageImage:
     Type: String
     Default: overcloud-cinder-volume
-  RabbitUserName:
-    Type: String
-    Default: "guest"
-  RabbitPassword:
-    Type: String
-    Default: "guest"
-    NoEcho: true
   OvercloudBlockStorageFlavor:
     Default: baremetal
     Description: Flavor for block storage nodes to request when deploying.