diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-25 13:26:19 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-25 13:26:19 +0000 |
commit | b61f1a33d55a23df7cd451679ee356d12c7f4a24 (patch) | |
tree | 629e2317256aa7c270049008d1b472dc25e01085 /puppet/services/pacemaker | |
parent | 319c42475c3c8b611bf685ca0aff4e9b79d0b570 (diff) | |
parent | fbbd134f6bed6f1a5093453681fd121206ff5e35 (diff) |
Merge "Enable gnocchi systemd services"
Diffstat (limited to 'puppet/services/pacemaker')
-rw-r--r-- | puppet/services/pacemaker/gnocchi-api.yaml | 2 | ||||
-rw-r--r-- | puppet/services/pacemaker/gnocchi-metricd.yaml | 1 | ||||
-rw-r--r-- | puppet/services/pacemaker/gnocchi-statsd.yaml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/gnocchi-api.yaml b/puppet/services/pacemaker/gnocchi-api.yaml index 1f6ed461..50bd3fa7 100644 --- a/puppet/services/pacemaker/gnocchi-api.yaml +++ b/puppet/services/pacemaker/gnocchi-api.yaml @@ -35,5 +35,7 @@ outputs: config_settings: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] + - gnocchi::metricd::manage_service: false + gnocchi::metricd::enabled: false step_config: | include ::tripleo::profile::pacemaker::gnocchi::api diff --git a/puppet/services/pacemaker/gnocchi-metricd.yaml b/puppet/services/pacemaker/gnocchi-metricd.yaml index cea27e9a..0a6b03ea 100644 --- a/puppet/services/pacemaker/gnocchi-metricd.yaml +++ b/puppet/services/pacemaker/gnocchi-metricd.yaml @@ -36,6 +36,7 @@ outputs: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] - gnocchi::metricd::manage_service: false + gnocchi::metricd::enabled: false tripleo::profile::pacemaker::gnocchi::gnocchi_indexer_backend: {get_attr: [GnocchiServiceBase, aux_parameters, gnocchi_indexer_backend]} step_config: | diff --git a/puppet/services/pacemaker/gnocchi-statsd.yaml b/puppet/services/pacemaker/gnocchi-statsd.yaml index 2e1531fc..12256d32 100644 --- a/puppet/services/pacemaker/gnocchi-statsd.yaml +++ b/puppet/services/pacemaker/gnocchi-statsd.yaml @@ -36,6 +36,7 @@ outputs: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] - gnocchi::statsd::manage_service: false + gnocchi::statsd::enabled: false tripleo::profile::pacemaker::gnocchi::gnocchi_indexer_backend: {get_attr: [GnocchiServiceBase, aux_parameters, gnocchi_indexer_backend]} step_config: | include ::tripleo::profile::pacemaker::gnocchi::statsd |