configure Heat with new authtoken parameters
Configure Heat with new authtoken parameters provided by puppet-heat module. Also move the authtoken parameters in heat-base, required by both heat-engine and heat-api. Depends-On: I7a9d10b0a8092b3d0c70708b57637098cfe2b56d Change-Id: Id5cd3e830f64263c8d39c7d2973c99d0380e772c
This commit is contained in:
parent
a02cee9e3b
commit
a9388834e3
puppet/services
@ -32,6 +32,10 @@ parameters:
|
|||||||
via parameter_defaults in the resource registry. This
|
via parameter_defaults in the resource registry. This
|
||||||
mapping overrides those in ServiceNetMapDefaults.
|
mapping overrides those in ServiceNetMapDefaults.
|
||||||
type: json
|
type: json
|
||||||
|
HeatPassword:
|
||||||
|
description: The password for the Heat service and db account, used by the Heat services.
|
||||||
|
type: string
|
||||||
|
hidden: true
|
||||||
DefaultPasswords:
|
DefaultPasswords:
|
||||||
default: {}
|
default: {}
|
||||||
type: json
|
type: json
|
||||||
@ -60,11 +64,13 @@ outputs:
|
|||||||
key: 'context_is_admin'
|
key: 'context_is_admin'
|
||||||
value: 'role:admin'
|
value: 'role:admin'
|
||||||
heat::rabbit_heartbeat_timeout_threshold: 60
|
heat::rabbit_heartbeat_timeout_threshold: 60
|
||||||
heat::keystone_tenant: 'service'
|
heat::keystone::authtoken::project_name: 'service'
|
||||||
|
heat::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||||
|
heat::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||||
|
heat::keystone::authtoken::password: {get_param: HeatPassword}
|
||||||
heat::keystone::domain::domain_name: 'heat_stack'
|
heat::keystone::domain::domain_name: 'heat_stack'
|
||||||
heat::keystone::domain::domain_admin: 'heat_stack_domain_admin'
|
heat::keystone::domain::domain_admin: 'heat_stack_domain_admin'
|
||||||
heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost'
|
heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost'
|
||||||
heat::auth_plugin: 'password'
|
|
||||||
heat::cron::purge_deleted::age: 30
|
heat::cron::purge_deleted::age: 30
|
||||||
heat::cron::purge_deleted::age_type: 'days'
|
heat::cron::purge_deleted::age_type: 'days'
|
||||||
heat::cron::purge_deleted::maxdelay: 3600
|
heat::cron::purge_deleted::maxdelay: 3600
|
||||||
|
@ -71,8 +71,6 @@ outputs:
|
|||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/heat'
|
- '/heat'
|
||||||
heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
|
heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
|
||||||
heat::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
|
||||||
heat::keystone_password: {get_param: HeatPassword}
|
|
||||||
heat::db::mysql::password: {get_param: HeatPassword}
|
heat::db::mysql::password: {get_param: HeatPassword}
|
||||||
heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
|
heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
|
||||||
heat::db::mysql::user: heat
|
heat::db::mysql::user: heat
|
||||||
|
Loading…
Reference in New Issue
Block a user