diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-05-05 13:11:43 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-05-05 13:11:43 +0000 |
commit | 4e4c40376082197822d9cd64c09bee6cadf8067c (patch) | |
tree | b22e2c9ec769a90d32e5814181edd1b7f01640a2 /overcloud-without-mergepy.yaml | |
parent | 48c3627baae7a061b22f273c3d55151577085895 (diff) | |
parent | cf4d918cd923c228d37fc06ecadf2f48c80ef400 (diff) |
Merge "puppet: install Horizon on overcloud-controller"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 82354169..70e197d2 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -545,6 +545,11 @@ resources: properties: length: 16 + HorizonSecret: + type: OS::Heat::RandomString + properties: + length: 10 + Controller: type: OS::Heat::ResourceGroup properties: @@ -581,6 +586,7 @@ resources: HeatPassword: {get_param: HeatPassword} HeatStackDomainAdminPassword: {get_param: HeatStackDomainAdminPassword} HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey} + HorizonSecret: {get_resource: HorizonSecret} Image: {get_param: controllerImage} ImageUpdatePolicy: {get_param: ImageUpdatePolicy} KeyName: {get_param: KeyName} |