x/collectd-openstack-plugins
Code Issues Proposed changes

Use trueorfalse function in deployment of collectd-ceilometer

Browse Source 
- Replaced occurances of if x == "True" with the
  trueorfalse function from devstack

Change-Id: Ibaee86ab2073c532bca7520582b849906c7712e4
Related-Bug: #1668201
This commit is contained in:
Petr Fortelny
2017-02-24 13:32:37 +01:00
parent 536f851533
commit ab32d09587
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/settings
View File

@@ -3,17 +3,17 @@ COLLECTD_CEILOMETER_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd
COLLECTD_BATCH_SIZE=${COLLECTD_BATCH_SIZE:-1} COLLECTD_BATCH_SIZE=${COLLECTD_BATCH_SIZE:-1}
COLLECTD_BRANCH=${COLLECTD_BRANCH:-collectd-5.7} COLLECTD_BRANCH=${COLLECTD_BRANCH:-collectd-5.7}
COLLECTD_DIR=${COLLECTD_DIR:-$DEST/collectd-$COLLECTD_BRANCH/} COLLECTD_DIR=${COLLECTD_DIR:-$DEST/collectd-$COLLECTD_BRANCH/}
COLLECTD_INSTALL=${COLLECTD_INSTALL:-True} COLLECTD_INSTALL=$(trueorfalse True COLLECTD_INSTALL)
COLLECTD_INSTALL_TYPE=${COLLECTD_INSTALL_TYPE:-'binary'} COLLECTD_INSTALL_TYPE=${COLLECTD_INSTALL_TYPE:-'binary'}
COLLECTD_CONF_DIR=${COLLECTD_CONF_DIR:-''} COLLECTD_CONF_DIR=${COLLECTD_CONF_DIR:-''}
# this is a mirror of: git://git.verplant.org/collectd.git # this is a mirror of: git://git.verplant.org/collectd.git
COLLECTD_REPO=${COLLECTD_REPO:-'https://github.com/collectd/collectd.git'} COLLECTD_REPO=${COLLECTD_REPO:-'https://github.com/collectd/collectd.git'}
COLLECTD_PREFIX=${COLLECTD_PREFIX:-'/usr'} COLLECTD_PREFIX=${COLLECTD_PREFIX:-'/usr'}
COLLECTD_CEILOMETER_VERBOSE=${COLLECTD_CEILOMETER_VERBOSE:-False} COLLECTD_CEILOMETER_VERBOSE=$(trueorfalse False COLLECTD_CEILOMETER_VERBOSE)
COLLECTD_CEILOMETER_ENABLED=${COLLECTD_CEILOMETER_ENABLED:-False} COLLECTD_CEILOMETER_ENABLED=$(trueorfalse False COLLECTD_CEILOMETER_ENABLED)
COLLECTD_GNOCCHI_ENABLED=${COLLECTD_GNOCCHI_ENABLED:-True} COLLECTD_GNOCCHI_ENABLED=$(trueorfalse True COLLECTD_GNOCCHI_ENABLED)
# Configurations for Collectd LogFile plugin # Configurations for Collectd LogFile plugin
COLLECTD_LOG_FILE=${COLLECTD_LOG_FILE:-$LOGDIR/collectd.log} COLLECTD_LOG_FILE=${COLLECTD_LOG_FILE:-$LOGDIR/collectd.log}