openstack/tripleo-heat-templates
Code Issues Proposed changes

Switch central and compute templates to use polling agent

Browse Source 
Ceilometer central and compute agent classes are deprecated. Instead
polling agent should be used with relevant namespaces.

Change-Id: Ida247fe29500ff02b76602c785a3f42fa4291227
Depends-On: I1ee50124bf8936e12414f984e1bcd4545d92e953
This commit is contained in:
Pradeep Kilambi 2017-02-07 16:12:10 -05:00
parent 7b02ad73fb
commit 873ab8eb4c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/services/ceilometer-agent-central.yaml
View File

@ -52,8 +52,9 @@ outputs:
map_merge: map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings] - get_attr: [CeilometerServiceBase, role_data, config_settings]
- ceilometer_redis_password: {get_param: RedisPassword} - ceilometer_redis_password: {get_param: RedisPassword}
central_namespace: true
step_config: | step_config: |
include ::tripleo::profile::base::ceilometer::agent::central include ::tripleo::profile::base::ceilometer::agent::polling
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running" - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b' shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'

3
puppet/services/ceilometer-agent-compute.yaml
View File

@ -46,8 +46,9 @@ outputs:
map_merge: map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings] - get_attr: [CeilometerServiceBase, role_data, config_settings]
- ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod} - ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod}
compute_namespace: true
step_config: | step_config: |
include ::tripleo::profile::base::ceilometer::agent::compute include ::tripleo::profile::base::ceilometer::agent::polling
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running" - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b' shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b'