diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-28 16:09:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-28 16:09:58 +0000 |
| commit | 8431fa153b9e1f702baa02405365c4425a3e9a3e (patch) | |
| tree | 7aa38522d3e8e8535edb3873978541f52f8fcf87 | |
| parent | 86fe8bf7e697233fecaff91d2f8669e059ff37c9 (diff) | |
| parent | 873ab8eb4c49274d92b0c29f3e08b696e05082d6 (diff) | |
Merge "Switch central and compute templates to use polling agent"
| -rw-r--r-- | puppet/services/ceilometer-agent-central.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/ceilometer-agent-compute.yaml | 3 |
2 files changed, 4 insertions, 2 deletions
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' |