diff options
Diffstat (limited to 'src/fuel-plugin/deployment_scripts')
3 files changed, 4 insertions, 9 deletions
diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh index 8f4edef0..bc430bee 100755 --- a/src/fuel-plugin/deployment_scripts/install.sh +++ b/src/fuel-plugin/deployment_scripts/install.sh @@ -11,6 +11,8 @@ OS_PASSWORD=$4 CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL} CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000} +apt-get install -y collectd + rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME cd $INSTALL_HOME curl http://$HOST:8080/plugins/fuel-plugin-collectd-ceilometer-0.9/repositories/ubuntu/collectd-ceilometer.tgz | tar xzvf - @@ -52,3 +54,5 @@ cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf </Module> </Plugin> EOF + +service collectd restart diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp deleted file mode 100644 index ffe3d6d9..00000000 --- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp +++ /dev/null @@ -1,5 +0,0 @@ -if $operatingsystem == 'Ubuntu' { - package { 'collectd': - ensure => installed, - } -} diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp deleted file mode 100644 index 59f5151b..00000000 --- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp +++ /dev/null @@ -1,4 +0,0 @@ -exec { "restart collectd": - command => "service collectd restart", - path => "/usr/bin:/usr/sbin:/bin:/sbin"; -} |