de5d0375e3
When creating the collectd-ceilometer-plugin.conf file, incorrect values were used This commit changes the following variables: - OS_USERNAME "$OS_USERNAME" -> OS_USERNAME "ceilometer" the service username is hardcoded, and OS_USERNAME overrides an existing variable used by OpenStack - OS_PASSWORD "$OS_PASSWORD" -> OS_PASSWORD "$SERVICE_PASSWORD" these are usually identical for devstack, but can be set differently - OS_TENANT_NAME "service" -> OS_TENANT_NAME "$SERVICE_TENANT_NAME" set to service by default. This change also removes the code that overwrote the OS_USERNAME and OS_PASSWORD variables in devstack/settings Change-Id: I9c8435766aa8448210bf06676f4e06d8fbf3a7a8 Closes-Bug: #1605352
28 lines
901 B
Plaintext
28 lines
901 B
Plaintext
# General settings
|
|
COLLECTD_CEILOMETER_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )
|
|
COLLECTD_BATCH_SIZE=${COLLECTD_BATCH_SIZE:-1}
|
|
COLLECTD_INSTALL=${COLLECTD_INSTALL:-True}
|
|
COLLECTD_CONF_DIR=${COLLECTD_CONF_DIR:-''}
|
|
|
|
COLLECTD_CEILOMETER_VERBOSE=${COLLECTD_CEILOMETER_VERBOSE:-False}
|
|
|
|
# Configurations for Collectd LogFile plugin
|
|
COLLECTD_LOG_FILE=${COLLECTD_LOG_FILE:-$LOGDIR/collectd.log}
|
|
COLLECTD_LOG_LEVEL=${COLLECTD_LOG_LEVEL:-info}
|
|
|
|
# Ceilometer connection info.
|
|
CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
|
|
CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
|
|
|
|
# Auth info
|
|
OS_AUTH_URL="$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION"
|
|
|
|
# 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
|