telemetry: remove coordination_url hiera settings
They are now normalized and set in puppet-tripleo. Change-Id: I197481c577b85894178e7899a55869da47847755 Closes-Bug: #1629279 Depends-On: Ic6de09acf0d36ca90cc2041c0add1bc2b4a369a5
This commit is contained in:
parent
b97c913f23
commit
d720f22925
|
@ -60,14 +60,6 @@ outputs:
|
||||||
service_name: aodh_base
|
service_name: aodh_base
|
||||||
config_settings:
|
config_settings:
|
||||||
aodh_redis_password: {get_param: RedisPassword}
|
aodh_redis_password: {get_param: RedisPassword}
|
||||||
aodh::evaluator::coordination_url:
|
|
||||||
list_join:
|
|
||||||
- ''
|
|
||||||
- - 'redis://:'
|
|
||||||
- {get_param: RedisPassword}
|
|
||||||
- '@'
|
|
||||||
- "%{hiera('redis_vip')}"
|
|
||||||
- ':6379/'
|
|
||||||
aodh::db::database_connection:
|
aodh::db::database_connection:
|
||||||
list_join:
|
list_join:
|
||||||
- ''
|
- ''
|
||||||
|
|
|
@ -51,14 +51,6 @@ outputs:
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [CeilometerServiceBase, role_data, config_settings]
|
- get_attr: [CeilometerServiceBase, role_data, config_settings]
|
||||||
- ceilometer::agent::central::coordination_url:
|
- ceilometer_redis_password: {get_param: RedisPassword}
|
||||||
list_join:
|
|
||||||
- ''
|
|
||||||
- - 'redis://:'
|
|
||||||
- {get_param: RedisPassword}
|
|
||||||
- '@'
|
|
||||||
- "%{hiera('redis_vip')}"
|
|
||||||
- ':6379/'
|
|
||||||
ceilometer_redis_password: {get_param: RedisPassword}
|
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::ceilometer::agent::central
|
include ::tripleo::profile::base::ceilometer::agent::central
|
||||||
|
|
|
@ -68,14 +68,6 @@ outputs:
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/gnocchi'
|
- '/gnocchi'
|
||||||
gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
|
gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
|
||||||
gnocchi::storage::coordination_url:
|
|
||||||
list_join:
|
|
||||||
- ''
|
|
||||||
- - 'redis://:'
|
|
||||||
- {get_param: RedisPassword}
|
|
||||||
- '@'
|
|
||||||
- "%{hiera('redis_vip')}"
|
|
||||||
- ':6379/'
|
|
||||||
gnocchi::storage::swift::swift_user: 'service:gnocchi'
|
gnocchi::storage::swift::swift_user: 'service:gnocchi'
|
||||||
gnocchi::storage::swift::swift_auth_version: 2
|
gnocchi::storage::swift::swift_auth_version: 2
|
||||||
gnocchi::storage::swift::swift_key: {get_param: GnocchiPassword}
|
gnocchi::storage::swift::swift_key: {get_param: GnocchiPassword}
|
||||||
|
|
Loading…
Reference in New Issue