diff options
| author |   Jan Provaznik <jprovazn@redhat.com> | 2014-01-30 17:16:18 -0500 |
|---|---|---|
| committer | Jan Provaznik <jprovazn@redhat.com> | 2014-02-26 09:07:59 +0100 |
| commit | db8f15a27d16c30e31e0855d415b597eb292983b (patch) | |
| tree | d7929ecf6d6bdfa87c3b18495310d6e28bf756ba | |
| parent | edf87127836805197d2d67c6c2addcdab60c1b7a (diff) | |
Add rabbit.cookie attribute
All nodes in rabbitmq cluster should have same cookie. This patch adds
default random cookie to existing templates.
Change-Id: I6579089bd95b0169db20635479e077f3ecade8e2
| -rw-r--r-- | notcompute.yaml | 4 | ||||
| -rw-r--r-- | overcloud-source.yaml | 14 | ||||
| -rw-r--r-- | undercloud-source.yaml | 14 |
3 files changed, 32 insertions, 0 deletions
diff --git a/notcompute.yaml b/notcompute.yaml index b097dd02..2d3301fb 100644 --- a/notcompute.yaml +++ b/notcompute.yaml @@ -191,6 +191,10 @@ Resources: Ref: RabbitUserName password: Ref: RabbitPassword + cookie: + Fn::GetAtt: + - RabbitCookie + - value service-password: Ref: ServicePassword Properties: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 6d21a4dc..fa626aa2 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -124,7 +124,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: @@ -435,6 +445,10 @@ Resources: Ref: RabbitUserName password: Ref: RabbitPassword + cookie: + Fn::GetAtt: + - RabbitCookie + - value ntp: servers: - {server: {Ref: NtpServer}, fudge: "stratum 0"} diff --git a/undercloud-source.yaml b/undercloud-source.yaml index efce1e87..97a05ed9 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -55,7 +55,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: @@ -191,6 +201,10 @@ Resources: Ref: RabbitUserName password: Ref: RabbitPassword + cookie: + Fn::GetAtt: + - RabbitCookie + - value undercloud: Type: OS::Nova::Server Properties: |