diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-03-16 19:02:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-03-16 19:02:42 +0000 |
commit | 29327cd0902cc88229c693b44449f03bf88e911f (patch) | |
tree | c185d7a6afbc1822e819a2fe115a0c1dc88764ff /overcloud-without-mergepy.yaml | |
parent | 4bc4171a151ebac2c9f1e42aed7dc23de844e429 (diff) | |
parent | b05137d61ae3a0ab2abcf0e259446183d3f5ddd8 (diff) |
Merge "Make heat auth_encryption_key random"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 10e83363..c54248d5 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -500,6 +500,9 @@ parameters: resources: + HeatAuthEncryptionKey: + type: OS::Heat::RandomString + Controller: type: OS::Heat::ResourceGroup properties: @@ -527,6 +530,7 @@ resources: GlanceLogFile: {get_param: GlanceLogFile} HeatPassword: {get_param: HeatPassword} HeatStackDomainAdminPassword: {get_param: HeatStackDomainAdminPassword} + HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey} Image: {get_param: controllerImage} ImageUpdatePolicy: {get_param: ImageUpdatePolicy} KeyName: {get_param: KeyName} |