From 51dc2d1a638855bcab4f43b7b7823fae8d9ea4a5 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Fri, 15 Jul 2016 06:24:12 +0800 Subject: Add collectd build & installation Change-Id: I9305715bae269fb2e65a083e4e19f1ed6c9b8331 Signed-off-by: Guo Ruijing --- src/fuel-plugin/deployment_scripts/install.sh | 2 +- .../deployment_scripts/puppet/manifests/collectd_install.pp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/fuel-plugin/deployment_scripts') diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh index 9a9bf61..8f4edef 100755 --- a/src/fuel-plugin/deployment_scripts/install.sh +++ b/src/fuel-plugin/deployment_scripts/install.sh @@ -47,7 +47,7 @@ cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf # # Ceilometer user creds OS_USERNAME "$OS_USERNAME" OS_PASSWORD "$OS_PASSWORD" - OS_TENANT_NAME "service" + OS_TENANT_NAME "services" diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp index 63a2e94..ffe3d6d 100644 --- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp +++ b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp @@ -1,6 +1,5 @@ if $operatingsystem == 'Ubuntu' { - exec { "install collectd": - command => "apt-get install -y collectd", - path => "/usr/bin:/usr/sbin:/bin:/sbin"; + package { 'collectd': + ensure => installed, } } -- cgit 1.2.3-korg