openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Switch central and compute templates to use polling agent"

Browse Source
This commit is contained in:
Jenkins 2017-02-28 16:09:58 +00:00 committed by Gerrit Code Review
commit 8431fa153b
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:
- 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'

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

@ -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'