summaryrefslogtreecommitdiffstats
path: root/src/fuel-plugin/deployment_scripts
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-07-15 06:24:12 +0800
committerGuo Ruijing <ruijing.guo@intel.com>2016-07-18 02:28:50 +0800
commit51dc2d1a638855bcab4f43b7b7823fae8d9ea4a5 (patch)
tree35966fc125eb013a6d588d523ec27a8f70390b01 /src/fuel-plugin/deployment_scripts
parent6a0837238ff13d3294e5a7181fc3de40e3094625 (diff)
Add collectd build & installation
Change-Id: I9305715bae269fb2e65a083e4e19f1ed6c9b8331 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/fuel-plugin/deployment_scripts')
-rwxr-xr-xsrc/fuel-plugin/deployment_scripts/install.sh2
-rw-r--r--src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh
index 9a9bf613..8f4edef0 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"
</Module>
</Plugin>
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 63a2e949..ffe3d6d9 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,
}
}