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 "Remove deprecated hdp plugin and add ambari"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
gnocchi-base.yaml
diff --git
a/puppet/services/gnocchi-base.yaml
b/puppet/services/gnocchi-base.yaml
index
44f3c3c
..
3631508
100644
(file)
--- a/
puppet/services/gnocchi-base.yaml
+++ b/
puppet/services/gnocchi-base.yaml
@@
-30,6
+30,10
@@
parameters:
CephClientUserName:
default: openstack
type: string
CephClientUserName:
default: openstack
type: string
+ KeystoneRegion:
+ type: string
+ default: 'regionOne'
+ description: Keystone region for endpoint
outputs:
aux_parameters:
outputs:
aux_parameters:
@@
-39,6
+43,7
@@
outputs:
role_data:
description: Shared role data for the Heat services.
value:
role_data:
description: Shared role data for the Heat services.
value:
+ service_name: gnocchi_base
config_settings:
#Gnocchi engine
gnocchi::debug: {get_input: debug}
config_settings:
#Gnocchi engine
gnocchi::debug: {get_input: debug}
@@
-51,9
+56,6
@@
outputs:
- '@'
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/gnocchi'
- '@'
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/gnocchi'
- gnocchi::keystone::auth::region: 'regionOne'
- gnocchi::keystone::auth::tenant: 'service'
- gnocchi::keystone::auth::password: {get_param: GnocchiPassword}
gnocchi::db::mysql::password: {get_param: GnocchiPassword}
gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
#Gnocchi API
gnocchi::db::mysql::password: {get_param: GnocchiPassword}
gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
#Gnocchi API
@@
-61,7
+63,6
@@
outputs:
gnocchi::api::manage_service: false
gnocchi::api::enabled: true
gnocchi::api::service_name: 'httpd'
gnocchi::api::manage_service: false
gnocchi::api::enabled: true
gnocchi::api::service_name: 'httpd'
- gnocchi::api::keystone_tenant: 'service'
gnocchi::api::keystone_password: {get_param: GnocchiPassword}
gnocchi::wsgi::apache::ssl: false
gnocchi::storage::swift::swift_user: 'service:gnocchi'
gnocchi::api::keystone_password: {get_param: GnocchiPassword}
gnocchi::wsgi::apache::ssl: false
gnocchi::storage::swift::swift_user: 'service:gnocchi'
@@
-72,10
+73,10
@@
outputs:
gnocchi::storage::ceph::ceph_keyring:
list_join:
- '.'
gnocchi::storage::ceph::ceph_keyring:
list_join:
- '.'
- - - '/etc/ceph/ceph
/
'
- - 'client
/
'
+ - - '/etc/ceph/ceph'
+ - 'client'
- {get_param: CephClientUserName}
- {get_param: CephClientUserName}
- - '
/
keyring'
+ - 'keyring'
#Gnocchi statsd
gnocchi::statsd::manage_service: false
gnocchi::statsd::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26'
#Gnocchi statsd
gnocchi::statsd::manage_service: false
gnocchi::statsd::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26'
@@
-84,8
+85,10
@@
outputs:
gnocchi::statsd::flush_delay: 10
gnocchi::statsd::archive_policy_name: 'low'
gnocchi::db::mysql::user: gnocchi
gnocchi::statsd::flush_delay: 10
gnocchi::statsd::archive_policy_name: 'low'
gnocchi::db::mysql::user: gnocchi
- gnocchi::db::mysql::host: {get_param: [EndpointMap, Mysql
Virtual, host
]}
+ gnocchi::db::mysql::host: {get_param: [EndpointMap, Mysql
Internal, host_nobrackets
]}
gnocchi::db::mysql::dbname: gnocchi
gnocchi::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
gnocchi::db::mysql::dbname: gnocchi
gnocchi::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
+ gnocchi::auth::auth_region: {get_param: KeystoneRegion}
+ gnocchi::auth::auth_tenant_name: 'service'