x/collectd-openstack-plugins
Code Issues Proposed changes

Merge "Change the extension name of backup .conf files"

Browse Source
This commit is contained in:
Jenkins 2017-05-05 09:49:50 +00:00 committed by Gerrit Code Review
commit 4f426a9fb4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/libs/collectd
View File

@ -175,9 +175,9 @@ function adapt_collectd_conf {
sudo sed -i 's|File.*$|File "'$COLLECTD_LOG_FILE'"|g' $COLLECTD_CONF_DIR/01-logfile.conf sudo sed -i 's|File.*$|File "'$COLLECTD_LOG_FILE'"|g' $COLLECTD_CONF_DIR/01-logfile.conf
# Create a backup for all of the .conf files # Create a backup for all of the .conf files
sudo mkdir -p "$COLLECTD_CONF_DIR/backup" sudo mkdir -p $COLLECTD_CONF_DIR/backup
sudo cp $COLLECTD_CONF_DIR/*.conf $COLLECTD_CONF_DIR/backup/ sudo cp $COLLECTD_CONF_DIR/*.conf $COLLECTD_CONF_DIR/backup/
sudo rename 's|\.conf$|.conf.bak|' $COLLECTD_CONF_DIR/backup/*.conf
} }
function config_custom_units { function config_custom_units {

7
releasenotes/notes/bug-1684579-eea80d719dd3cdc4.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixes 'bug 1684579 https://bugs.launchpad.net/collectd-ceilometer-plugin/+bug/1684579'.
Changed the extensions for the back-up .conf files. This prevents back-up
.conf file being read if the original .conf is deleted. Thus preventing
those plugins from running when they are not configured properly.