From ff0959a200cfad26d0c688bf293e3ebeb365ff48 Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu@redhat.com>
Date: Tue, 11 Feb 2014 15:52:37 -0800
Subject: Add username parameter for rabbit

Username is currently assumed to be guest in the configuration
files. This change makes it more explicit.

Configuration files in tripleo-image-elements will be updated
to use this parameter in an upcoming patch.

Change-Id: Ia176f4d573a3a293560c72236a4181befa678301
---
 overcloud-source.yaml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'overcloud-source.yaml')

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 77b4c529..2bec12f9 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -115,6 +115,15 @@ Parameters:
   NtpServer:
     Type: String
     Default: ''
+  RabbitUserName:
+    Default: guest
+    Description: The username for RabbitMQ
+    Type: String
+  RabbitPassword:
+    Default: guest
+    Description: The password for RabbitMQ
+    Type: String
+    NoEcho: true
   StaticHosts:
     Default:
       Fn::Join:
@@ -197,7 +206,6 @@ Resources:
             Ref: HypervisorNeutronPublicInterface
         NeutronBridgeMappings:
             Ref: NeutronBridgeMappings
-        RabbitPassword: "guest"
         StaticHosts:
             Ref: StaticHosts
   NovaCompute0:
@@ -388,7 +396,10 @@ Resources:
               - Fn::GetAtt:
                 - notCompute0
                 - networks
-        password: guest
+        username:
+          Ref: RabbitUserName
+        password:
+          Ref: RabbitPassword
       ntp:
         servers:
             - {server: {Ref: NtpServer}, fudge: "stratum 0"}
-- 
cgit 1.2.3-korg