diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-09-30 09:48:56 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-09-30 09:48:56 -0400 |
| commit | d720f22925d20f430fc64c8a809efc4bfc2b4038 (patch) | |
| tree | 33a88babc84f5dcc6b8dd9b24bc45246eeac44e0 | |
| parent | b97c913f23a0c01a14e74384edc4f2d3a9e0ec1f (diff) | |
telemetry: remove coordination_url hiera settings
They are now normalized and set in puppet-tripleo.
Change-Id: I197481c577b85894178e7899a55869da47847755
Closes-Bug: #1629279
Depends-On: Ic6de09acf0d36ca90cc2041c0add1bc2b4a369a5
| -rw-r--r-- | puppet/services/aodh-base.yaml | 8 | ||||
| -rw-r--r-- | puppet/services/ceilometer-agent-central.yaml | 10 | ||||
| -rw-r--r-- | puppet/services/gnocchi-base.yaml | 8 |
3 files changed, 1 insertions, 25 deletions
diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml index 821c9571..0e2410f7 100644 --- a/puppet/services/aodh-base.yaml +++ b/puppet/services/aodh-base.yaml @@ -60,14 +60,6 @@ outputs: service_name: aodh_base config_settings: aodh_redis_password: {get_param: RedisPassword} - aodh::evaluator::coordination_url: - list_join: - - '' - - - 'redis://:' - - {get_param: RedisPassword} - - '@' - - "%{hiera('redis_vip')}" - - ':6379/' aodh::db::database_connection: list_join: - '' diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml index 07f0b49d..c4abc307 100644 --- a/puppet/services/ceilometer-agent-central.yaml +++ b/puppet/services/ceilometer-agent-central.yaml @@ -51,14 +51,6 @@ outputs: config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] - - ceilometer::agent::central::coordination_url: - list_join: - - '' - - - 'redis://:' - - {get_param: RedisPassword} - - '@' - - "%{hiera('redis_vip')}" - - ':6379/' - ceilometer_redis_password: {get_param: RedisPassword} + - ceilometer_redis_password: {get_param: RedisPassword} step_config: | include ::tripleo::profile::base::ceilometer::agent::central diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index b5afd006..556baae0 100644 --- a/puppet/services/gnocchi-base.yaml +++ b/puppet/services/gnocchi-base.yaml @@ -68,14 +68,6 @@ outputs: - {get_param: [EndpointMap, MysqlInternal, host]} - '/gnocchi' 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_auth_version: 2 gnocchi::storage::swift::swift_key: {get_param: GnocchiPassword} |