Merge "Add rabbit.cookie attribute"

1 files changed, 14 insertions, 0 deletions

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index d3604646..42fc07a6 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -136,7 +136,17 @@ Parameters:
     Description: The password for RabbitMQ
     Type: String
     NoEcho: true
+  RabbitCookieSalt:
+    Type: String
+    Default: unset
+    Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
 Resources:
+  RabbitCookie:
+    Type: OS::Heat::RandomString
+    Properties:
+      length: 20
+      salt:
+        Ref: RabbitCookieSalt
   AccessPolicy:
     Properties:
       AllowedResources:
@@ -451,6 +461,10 @@ Resources:
           Ref: RabbitUserName
         password:
           Ref: RabbitPassword
+        cookie:
+          Fn::GetAtt:
+          - RabbitCookie
+          - value
       ntp:
         servers:
             - {server: {Ref: NtpServer}, fudge: "stratum 0"}