aboutsummaryrefslogtreecommitdiffstats
path: root/src/fuel-plugin/deployment_scripts
diff options
context:
space:
mode:
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,
}
}