diff options
author | Pradeep Kilambi <pkilambi@redhat.com> | 2017-04-12 16:36:38 -0400 |
---|---|---|
committer | Pradeep Kilambi <pkilambi@redhat.com> | 2017-04-12 16:36:38 -0400 |
commit | 789ce85635e0023ee825ab6c6d10aae3384e5bbf (patch) | |
tree | c43a30352bf4fe85a62305e56a6edcaa813279f2 /puppet | |
parent | 3e8b6289d708a858baa8460867926f871ab49ec0 (diff) |
Add service config settings to agent services
When containerizing ceilometer agents, keystone auth is not getting
set correctly as we're not including the service config settings.
Change-Id: Ic17d64eb39e1fcb64c198410f27adbe94c84b7d4
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: |