From 18c181f0b3ce07a0cd552a9060dd09a95cc26078 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@redhat.com>
Date: Wed, 3 Aug 2016 14:39:20 +0200
Subject: [PATCH] Rename ceilometer-dbsync in ceilometer-upgrade

Change-Id: I9adcc6c2180bae1d0e17a7d03fe2df9fca096487
---
 ceilometer/cmd/storage.py                           | 10 ++++++++--
 devstack/plugin.sh                                  |  2 +-
 .../rename-ceilometer-dbsync-eb7a1fa503085528.yaml  | 13 +++++++++++++
 setup.cfg                                           |  1 +
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/rename-ceilometer-dbsync-eb7a1fa503085528.yaml

diff --git a/ceilometer/cmd/storage.py b/ceilometer/cmd/storage.py
index 12a27bb42b..fadc255a08 100644
--- a/ceilometer/cmd/storage.py
+++ b/ceilometer/cmd/storage.py
@@ -20,19 +20,25 @@ from six import moves
 import six.moves.urllib.parse as urlparse
 import sqlalchemy as sa
 
-from ceilometer.i18n import _LE, _LI
+from ceilometer.i18n import _LE, _LI, _LW
 from ceilometer import service
 from ceilometer import storage
 
 LOG = log.getLogger(__name__)
 
 
-def dbsync():
+def upgrade():
     service.prepare_service()
     storage.get_connection_from_config(cfg.CONF, 'metering').upgrade()
     storage.get_connection_from_config(cfg.CONF, 'event').upgrade()
 
 
+def dbsync():
+    LOG.warning(_LW('ceilometer-dbsync is deprecated in favor of '
+                    'ceilometer-upgrade'))
+    upgrade()
+
+
 def expirer():
     service.prepare_service()
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b01f58f3e7..05e444ad27 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -362,7 +362,7 @@ function init_ceilometer {
     if is_service_enabled ceilometer-collector ceilometer-api && is_service_enabled mysql postgresql ; then
         if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] || [ "$CEILOMETER_BACKEND" = 'es' ] ; then
             recreate_database ceilometer
-            $CEILOMETER_BIN_DIR/ceilometer-dbsync
+            $CEILOMETER_BIN_DIR/ceilometer-upgrade
         fi
     fi
 }
diff --git a/releasenotes/notes/rename-ceilometer-dbsync-eb7a1fa503085528.yaml b/releasenotes/notes/rename-ceilometer-dbsync-eb7a1fa503085528.yaml
new file mode 100644
index 0000000000..8f26d82150
--- /dev/null
+++ b/releasenotes/notes/rename-ceilometer-dbsync-eb7a1fa503085528.yaml
@@ -0,0 +1,13 @@
+---
+prelude: >
+    Ceilometer backends are no more only databases but
+    also REST API like Gnocchi. So ceilometer-dbsync binary
+    name doesn't make a lot of sense and have been renamed
+    ceilometer-upgrade. The new binary handles database
+    schema upgrade like ceilometer-dbsync does, but it
+    also handle any changes needed in configured ceilometer
+    backends like Gnocchi.
+deprecations:
+  - For backward compatibility reason we temporary
+    keep ceilometer-dbsync, at least for one major version to
+    ensure deployer have time update their tooling.
diff --git a/setup.cfg b/setup.cfg
index 7a6a25690a..c3cd821c8c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -259,6 +259,7 @@ console_scripts =
     ceilometer-agent-notification = ceilometer.cmd.agent_notification:main
     ceilometer-send-sample = ceilometer.cmd.sample:send_sample
     ceilometer-dbsync = ceilometer.cmd.storage:dbsync
+    ceilometer-upgrade = ceilometer.cmd.storage:upgrade
     ceilometer-db-legacy-clean = ceilometer.cmd.storage:db_clean_legacy
     ceilometer-expirer = ceilometer.cmd.storage:expirer
     ceilometer-rootwrap = oslo_rootwrap.cmd:main