From 873ab8eb4c49274d92b0c29f3e08b696e05082d6 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Tue, 7 Feb 2017 16:12:10 -0500 Subject: Switch central and compute templates to use polling agent Ceilometer central and compute agent classes are deprecated. Instead polling agent should be used with relevant namespaces. Change-Id: Ida247fe29500ff02b76602c785a3f42fa4291227 Depends-On: I1ee50124bf8936e12414f984e1bcd4545d92e953 --- puppet/services/ceilometer-agent-central.yaml | 3 ++- puppet/services/ceilometer-agent-compute.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'puppet/services') diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml index cf8a8a8e..9baca145 100644 --- a/puppet/services/ceilometer-agent-central.yaml +++ b/puppet/services/ceilometer-agent-central.yaml @@ -52,8 +52,9 @@ outputs: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] - ceilometer_redis_password: {get_param: RedisPassword} + central_namespace: true step_config: | - include ::tripleo::profile::base::ceilometer::agent::central + include ::tripleo::profile::base::ceilometer::agent::polling upgrade_tasks: - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running" shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b' diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml index 00042914..21f5ce63 100644 --- a/puppet/services/ceilometer-agent-compute.yaml +++ b/puppet/services/ceilometer-agent-compute.yaml @@ -46,8 +46,9 @@ outputs: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] - ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod} + compute_namespace: true step_config: | - include ::tripleo::profile::base::ceilometer::agent::compute + include ::tripleo::profile::base::ceilometer::agent::polling upgrade_tasks: - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running" shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b' -- cgit 1.2.3-korg