diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-03-11 05:51:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-03-11 05:51:41 +0000 |
| commit | c609ce4c7cc0df8200af38c01377f4dfdc9620bc (patch) | |
| tree | 72f528205705961d1c79f3bc228ca0d58e568755 | |
| parent | a2602039fc66891bb9d08dbd5963c9968e1a8ee8 (diff) | |
| parent | db8f15a27d16c30e31e0855d415b597eb292983b (diff) | |
Merge "Add rabbit.cookie attribute"
| -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 1f96ac9a..2ad5b30b 100644 --- a/notcompute.yaml +++ b/notcompute.yaml @@ -203,6 +203,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 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"} diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 805239a9..4fe2976c 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -63,7 +63,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: @@ -203,6 +213,10 @@ Resources: Ref: RabbitUserName password: Ref: RabbitPassword + cookie: + Fn::GetAtt: + - RabbitCookie + - value undercloud: Type: OS::Nova::Server Properties: |