summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2017-01-18 15:37:25 -0500
committerPradeep Kilambi <pkilambi@redhat.com>2017-01-18 15:37:25 -0500
commit70e8e7a744bea95fbaecbbb76c1f97ab858a9b85 (patch)
tree8621c04036663c0c97a7bc0144fcfcf3f7bbb84e
parentdcfc58102c3581098394a75c5e2ce1aff676e413 (diff)
Expose instance discovery method for compute agent
Change-Id: Ia3c514ab75ec48bf350653ceef50e4d966219a87
-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