From c8538776d456151b1dcf4a2deef43e7ed80338c6 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Thu, 30 Jun 2016 15:48:55 +0200
Subject: [PATCH] devstack: prefix _drop_database

This avoids any possible conflict with another function named the same.

Change-Id: Ib3ad175d1150e54676f0f0ea7381ec96cf5e8ab4
---
 devstack/plugin.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 3aa21983ed..be27d18704 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -196,7 +196,7 @@ function _ceilometer_cleanup_apache_wsgi {
     fi
 }
 
-function _drop_database {
+function _ceilometer_drop_database {
     if is_service_enabled ceilometer-collector ceilometer-api ; then
         if [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then
             mongo ceilometer --eval "db.dropDatabase();"
@@ -210,7 +210,7 @@ function _drop_database {
 # from previous runs that a clean run would need to clean up
 function cleanup_ceilometer {
     _ceilometer_cleanup_apache_wsgi
-    _drop_database
+    _ceilometer_drop_database
     sudo rm -f "$CEILOMETER_CONF_DIR"/*
     sudo rmdir "$CEILOMETER_CONF_DIR"
 }
@@ -264,7 +264,7 @@ function _ceilometer_configure_storage_backend {
     else
         die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
     fi
-    _drop_database
+    _ceilometer_drop_database
 }
 
 # Configure Ceilometer