From b02acc8a4ffa7fcbcdc8db5434443a032979d5e7 Mon Sep 17 00:00:00 2001
From: Helena McGough <helena.mcgough@intel.com>
Date: Fri, 21 Apr 2017 13:27:54 +0000
Subject: [PATCH] Change the extension name of backup .conf files

  - Renamed the back-up's to .conf.b
  - Provided a reno for this change

Change-Id: I78d364a40515a63ecdb99fe5bd4dbb0010c28512
Closes-bug: #1684579
---
 devstack/libs/collectd                               | 4 ++--
 releasenotes/notes/bug-1684579-eea80d719dd3cdc4.yaml | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/bug-1684579-eea80d719dd3cdc4.yaml

diff --git a/devstack/libs/collectd b/devstack/libs/collectd
index 5dda2c4..2d822e3 100644
--- a/devstack/libs/collectd
+++ b/devstack/libs/collectd
@@ -180,9 +180,9 @@ function adapt_collectd_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
-    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 rename 's|\.conf$|.conf.bak|' $COLLECTD_CONF_DIR/backup/*.conf
 }
 
 function config_custom_units {
diff --git a/releasenotes/notes/bug-1684579-eea80d719dd3cdc4.yaml b/releasenotes/notes/bug-1684579-eea80d719dd3cdc4.yaml
new file mode 100644
index 0000000..9c8f134
--- /dev/null
+++ b/releasenotes/notes/bug-1684579-eea80d719dd3cdc4.yaml
@@ -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.