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 /puppet | |
| parent | 4bc4171a151ebac2c9f1e42aed7dc23de844e429 (diff) | |
| parent | b05137d61ae3a0ab2abcf0e259446183d3f5ddd8 (diff) | |
Merge "Make heat auth_encryption_key random"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller-puppet.yaml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 798596fc..76e5483a 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -133,6 +133,9 @@ parameters: type: string default: '' hidden: true + HeatAuthEncryptionKey: + description: Auth encryption key for heat-engine + type: string Image: type: string default: overcloud-control @@ -437,6 +440,7 @@ resources: - - 'http://' - {get_param: VirtualIP} - ':8000/v1/waitcondition' + heat_auth_encryption_key: {get_param: HeatAuthEncryptionKey} admin_password: {get_param: AdminPassword} admin_token: {get_param: AdminToken} neutron_public_interface_ip: {get_param: NeutronPublicInterfaceIP} @@ -642,7 +646,7 @@ resources: heat::engine::heat_watch_server_url: {get_input: heat.watch_server_url} heat::engine::heat_metadata_server_url: {get_input: heat.metadata_server_url} heat::engine::heat_waitcondition_server_url: {get_input: heat.waitcondition_server_url} - heat::engine::auth_encryption_key: unset___________ + heat::engine::auth_encryption_key: {get_input: heat_auth_encryption_key} heat::rabbit_userid: {get_input: rabbit_username} heat::rabbit_password: {get_input: rabbit_password} heat::rabbit_host: {get_input: controller_virtual_ip} |