diff --git a/devstack/libs/collectd b/devstack/libs/collectd index 2cd3ede..10aee44 100644 --- a/devstack/libs/collectd +++ b/devstack/libs/collectd @@ -3,13 +3,6 @@ # 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 { diff --git a/devstack/settings b/devstack/settings index d44b388..4b46360 100644 --- a/devstack/settings +++ b/devstack/settings @@ -2,6 +2,7 @@ COLLECTD_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd ) COLLECTD_BATCH_SIZE=${COLLECTD_BATCH_SIZE:-3} COLLECTD_INSTALL=${COLLECTD_INSTALL:-True} +COLLECTD_CONF_DIR=${COLLECTD_CONF_DIR:-''} # Ceilometer connection info. CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL} @@ -12,5 +13,12 @@ OS_AUTH_URL="$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" OS_USERNAME="ceilometer" OS_PASSWORD=${SERVICE_PASSWORD} - +# Fall back to default conf dir if option is unset +if [ -z $COLLECTD_CONF_DIR ]; then + if is_ubuntu; then + COLLECTD_CONF_DIR=/etc/collectd/collectd.conf.d + elif is_fedora; then + COLLECTD_CONF_DIR=/etc/collectd.d + fi +fi diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 465ca93..6a15ed8 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -12,6 +12,13 @@ To use collectd-ceilometer-plugin in collectd:: local.conf settings ------------------- +COLLECTD_CONF_DIR + (directory) Specify a directory where collectd conf files reside. + This is required if you use a distro other than Ubuntu or Fedora, or if + the config file is in a non default location. + Default: /etc/collectd/collectd.conf.d (Ubuntu) /etc/collect.d (Fedora) + + COLLECTD_INSTALL (True|False) Indicates whether to install collectd from package manager. Set this to False if you are running a custom collectd build or do not