summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-23 14:49:52 +0000
committerGerrit Code Review <review@openstack.org>2017-01-23 14:49:52 +0000
commit9a519142262f250a2851757a9c10956bab76e5ff (patch)
tree3039195bde2b15b24f1f4619b218a8f64784e277 /puppet
parent36d493c7deedc4d8792d03069048ceaf776ef26e (diff)
parent70e8e7a744bea95fbaecbbb76c1f97ab858a9b85 (diff)
Merge "Expose instance discovery method for compute agent"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/ceilometer-agent-compute.yaml10
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml
index b1d36c94..b666b86b 100644
--- a/puppet/services/ceilometer-agent-compute.yaml
+++ b/puppet/services/ceilometer-agent-compute.yaml
@@ -21,6 +21,12 @@ parameters:
MonitoringSubscriptionCeilometerCompute:
default: 'overcloud-ceilometer-agent-compute'
type: string
+ InstanceDiscoveryMethod:
+ default: 'libvirt_metadata'
+ description: Method used to discover instances running on compute node
+ type: string
+ constraints:
+ - allowed_values: ['naive', 'libvirt_metadata', 'workload_partitioning']
resources:
CeilometerServiceBase:
@@ -37,6 +43,8 @@ outputs:
service_name: ceilometer_agent_compute
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCompute}
config_settings:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
+ map_merge:
+ - get_attr: [CeilometerServiceBase, role_data, config_settings]
+ - ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod}
step_config: |
include ::tripleo::profile::base::ceilometer::agent::compute