Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update $service to $resource this variable does not exist in the context"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
cinder-base.yaml
diff --git
a/puppet/services/cinder-base.yaml
b/puppet/services/cinder-base.yaml
index
c312690
..
59c9b84
100644
(file)
--- a/
puppet/services/cinder-base.yaml
+++ b/
puppet/services/cinder-base.yaml
@@
-12,6
+12,15
@@
parameters:
default: ''
description: Set to True to enable debugging on all services.
type: string
default: ''
description: Set to True to enable debugging on all services.
type: string
+ ServiceNetMap:
+ default: {}
+ description: Mapping of service_name -> network name. Typically set
+ via parameter_defaults in the resource registry. This
+ mapping overrides those in ServiceNetMapDefaults.
+ type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-40,7
+49,7
@@
outputs:
role_data:
description: Role data for the Cinder base service.
value:
role_data:
description: Role data for the Cinder base service.
value:
- service_name: cinder
-
base
+ service_name: cinder
_
base
config_settings:
cinder::database_connection:
list_join:
config_settings:
cinder::database_connection:
list_join:
@@
-51,19
+60,12
@@
outputs:
- '@'
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/cinder'
- '@'
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/cinder'
- cinder::db::mysql::password: {get_param: CinderPassword}
cinder::debug: {get_param: Debug}
cinder::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
cinder::rabbit_userid: {get_param: RabbitUserName}
cinder::rabbit_password: {get_param: RabbitPassword}
cinder::rabbit_port: {get_param: RabbitClientPort}
cinder::debug: {get_param: Debug}
cinder::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
cinder::rabbit_userid: {get_param: RabbitUserName}
cinder::rabbit_password: {get_param: RabbitPassword}
cinder::rabbit_port: {get_param: RabbitClientPort}
- cinder::db::mysql::user: cinder
- cinder::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
- cinder::db::mysql::dbname: cinder
- cinder::db::mysql::allowed_hosts:
- - '%'
- - "%{hiera('mysql_bind_host')}"
cinder::rabbit_heartbeat_timeout_threshold: 60
cinder::rabbit_heartbeat_timeout_threshold: 60
- cinder::keystone::auth::tenant: 'service'
- cinder::host: hostgroup
cinder::cron::db_purge::destination: '/dev/null'
cinder::cron::db_purge::destination: '/dev/null'
+ cinder::db::database_db_max_retries: -1
+ cinder::db::database_max_retries: -1