diff --git a/devstack/libs/collectd b/devstack/libs/collectd
index 47ba43b..2cd3ede 100644
--- a/devstack/libs/collectd
+++ b/devstack/libs/collectd
@@ -3,17 +3,23 @@
 # common functions for collectd ceilometer plugin
 # -----------------------------------------------
 
+if is_ubuntu; then
+    COLLECTD_CONF_DIR=/etc/collectd/collectd.conf.d
+elif is_fedora; then
+    COLLECTD_CONF_DIR=/etc/collectd.d
+fi
+
 
 # start/stop service
 #
 function start_collectd {
-    if [ -e /usr/lib/systemd/system/collectd.service ]; then
+    if [ -e /usr/lib/systemd/system/collectd.service ] || [ -e /etc/init.d/collectd ]; then
         sudo service collectd start
     fi
 }
 
 function stop_collectd {
-    if [ -e /usr/lib/systemd/system/collectd.service ]; then
+    if [ -e /usr/lib/systemd/system/collectd.service ] || [ -e /etc/init.d/collectd ]; then
         sudo service collectd stop
     fi
 }
@@ -21,14 +27,17 @@ function stop_collectd {
 # install collectd service
 function install_collectd {
     if [[ "$COLLECTD_INSTALL" == True  ]]; then
-        install_package collectd
+        if is_fedora || is_ubuntu; then
+            install_package collectd
+        else
+            die $LINENO "No support for collectd on this platform"
+        fi
     fi
 }
 
 # Add conf file for plugin
 function adapt_collectd_conf {
-
-cat << EOF | sudo tee /etc/collectd.d/collectd-ceilometer-plugin.conf
+cat << EOF | sudo tee $COLLECTD_CONF_DIR/collectd-ceilometer-plugin.conf
 <LoadPlugin python>
   Globals true
 </LoadPlugin>
@@ -69,8 +78,8 @@ EOF
 # remove plugin conf file
 function restore_collectd_conf {
 
-    if [ -f '/etc/collectd.d/collectd-ceilometer-plugin.conf' ]; then
-        sudo rm -f /etc/collectd.d/collectd-ceilometer-plugin.conf
+    if [ -f '$COLLECTD_CONF_DIR/collectd-ceilometer-plugin.conf' ]; then
+        sudo rm -f $COLLECTD_CONF_DIR/collectd-ceilometer-plugin.conf
     fi
 
 }