diff options
author | Ryan Brady <rbrady@redhat.com> | 2014-03-11 20:06:54 -0400 |
---|---|---|
committer | Ryan Brady <rbrady@redhat.com> | 2014-03-11 20:59:47 -0400 |
commit | 640f7e2d8b6a2d43fa5e04c7424d98e508d317e4 (patch) | |
tree | 92e25fe3c84a25dfe53f50028ab8d8759c6dac5f | |
parent | c609ce4c7cc0df8200af38c01377f4dfdc9620bc (diff) |
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
-rw-r--r-- | block-storage.yaml | 7 |
1 files changed, 0 insertions, 7 deletions
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. |