aboutsummaryrefslogtreecommitdiffstats
path: root/src/fuel-plugin/deployment_scripts/puppet
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-01-17 17:16:27 -0800
committerGuo Ruijing <ruijing.guo@intel.com>2017-01-18 19:25:47 -0500
commit43d5947f671a83d0658c5c0215f63c343781d92f (patch)
tree352eaaaa85d945dc76cd9d085be1e26ce8b4976d /src/fuel-plugin/deployment_scripts/puppet
parent92bb2e468b8f9e939ecf86f3d1ae652e96429d9d (diff)
add collectd feature attributes for fuel plugin
Change-Id: I26b70963644527e3f4dfa1c0c7442fe257fb0a97 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/fuel-plugin/deployment_scripts/puppet')
-rw-r--r--src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
index cd77016b..cbbfcad2 100644
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
+++ b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
@@ -12,12 +12,19 @@ $ceilometer_hash = hiera_hash('ceilometer', {'user'=>'ceilometer'})
$auth_user = 'ceilometer'
$auth_password = $ceilometer_hash['user_password']
+
+$collectd_settings = hiera('fuel-plugin-collectd-ceilometer')
+$enable_mcelog = $collectd_settings['enable_mcelog']
+$enable_intel_rdt = $collectd_settings['enable_intel_rdt']
+$enable_hugepages = $collectd_settings['enable_hugepages']
+$enable_ovs_events = $collectd_settings['enable_ovs_events']
+
$exe_url = "http://${master_ip}:8080/plugins/fuel-plugin-collectd-ceilometer-1.0/deployment_scripts/install.sh"
if ($use_ceilometer) {
exec { "install collectd-ceilometer":
- command => "curl ${exe_url} | bash -s ${master_ip} ${auth_uri} ${auth_user} ${auth_password}",
+ command => "curl ${exe_url} | bash -s ${master_ip} ${auth_uri} ${auth_user} ${auth_password} ${enable_mcelog} ${enable_intel_rdt} ${enable_hugepages} ${enable_ovs_events}",
path => "/usr/bin:/usr/sbin:/bin:/sbin";
}
}
8 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346