diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-21 19:52:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-21 19:52:52 +0000 |
| commit | b24f6257f6c2de70d7df839b3257f86c4e9b7ffd (patch) | |
| tree | d9544dad0f9f41089f08fe532f0273590a036c42 /puppet | |
| parent | 8514fb649ab008bd8cf2da05ce6b44542a3aedae (diff) | |
| parent | 789ce85635e0023ee825ab6c6d10aae3384e5bbf (diff) | |
Merge "Add service config settings to agent services"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ceilometer-agent-central.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/ceilometer-agent-compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/ceilometer-agent-notification.yaml | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml index 80823526..0441e3a5 100644 --- a/puppet/services/ceilometer-agent-central.yaml +++ b/puppet/services/ceilometer-agent-central.yaml @@ -53,6 +53,8 @@ outputs: - get_attr: [CeilometerServiceBase, role_data, config_settings] - ceilometer_redis_password: {get_param: RedisPassword} central_namespace: true + service_config_settings: + get_attr: [CeilometerServiceBase, role_data, service_config_settings] step_config: | include ::tripleo::profile::base::ceilometer::agent::polling upgrade_tasks: diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml index 546bcd98..8462dd0c 100644 --- a/puppet/services/ceilometer-agent-compute.yaml +++ b/puppet/services/ceilometer-agent-compute.yaml @@ -47,6 +47,8 @@ outputs: - get_attr: [CeilometerServiceBase, role_data, config_settings] - ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod} compute_namespace: true + service_config_settings: + get_attr: [CeilometerServiceBase, role_data, service_config_settings] step_config: | include ::tripleo::profile::base::ceilometer::agent::polling upgrade_tasks: diff --git a/puppet/services/ceilometer-agent-notification.yaml b/puppet/services/ceilometer-agent-notification.yaml index 4ee43f49..d854e4cb 100644 --- a/puppet/services/ceilometer-agent-notification.yaml +++ b/puppet/services/ceilometer-agent-notification.yaml @@ -47,6 +47,8 @@ outputs: - ceilometer config_settings: get_attr: [CeilometerServiceBase, role_data, config_settings] + service_config_settings: + get_attr: [CeilometerServiceBase, role_data, service_config_settings] step_config: | include ::tripleo::profile::base::ceilometer::agent::notification upgrade_tasks: |