x/collectd-openstack-plugins
Code Issues Proposed changes

Change settings for ceilometer user in collectd config

Browse Source 
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
This commit is contained in:
Emma Foley
2016-09-19 14:29:22 +01:00
committed by Federico Ressi
parent 88a6c59570
commit de5d0375e3
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/libs/collectd
View File

@@ -64,9 +64,9 @@ cat << EOF | sudo tee $COLLECTD_CONF_DIR/collectd-ceilometer-plugin.conf
CEILOMETER_TIMEOUT "$CEILOMETER_TIMEOUT" CEILOMETER_TIMEOUT "$CEILOMETER_TIMEOUT"
# # Ceilometer user creds # # Ceilometer user creds
OS_USERNAME "$OS_USERNAME" OS_USERNAME "ceilometer"
OS_PASSWORD "$OS_PASSWORD" OS_PASSWORD "$SERVICE_PASSWORD"
OS_TENANT_NAME "service" OS_TENANT_NAME "$SERVICE_TENANT_NAME"
</Module> </Module>
</Plugin> </Plugin>

2
devstack/settings
View File

@@ -16,8 +16,6 @@ CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
# Auth info # Auth info
OS_AUTH_URL="$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" 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 # Fall back to default conf dir if option is unset
if [ -z $COLLECTD_CONF_DIR ]; then if [ -z $COLLECTD_CONF_DIR ]; then