From 1fedb7334bb0a3b6d585d00f91516ad2a9b4bde7 Mon Sep 17 00:00:00 2001
From: Ivan Kolodyazhny <e0ne@e0ne.info>
Date: Wed, 23 Aug 2017 19:08:01 +0300
Subject: [PATCH] Deprecate service-to-driver mapping for backups

This mapping was introduced for backward compatibility in 2013 and
works only for Swift and Ceph. I don't think that somebody actually uses
such old way to configure backup service so if should be safe to
deprecate it.

Change-Id: Ifc5642d11edfaf200df00ae640f18c65451853ae
---
 cinder/backup/manager.py                                  | 6 ++++++
 ...backup-service-to-driver-mapping-a3afabd4f55eca01.yaml | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/deprecate-backup-service-to-driver-mapping-a3afabd4f55eca01.yaml

diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py
index 9ab8e993524..a71e309e3de 100644
--- a/cinder/backup/manager.py
+++ b/cinder/backup/manager.py
@@ -34,6 +34,7 @@ Volume backups can be created, restored, deleted and listed.
 import os
 from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_log import versionutils
 import oslo_messaging as messaging
 from oslo_service import loopingcall
 from oslo_service import periodic_task
@@ -106,6 +107,11 @@ class BackupManager(manager.ThreadPoolManager):
         """Maps services to drivers."""
 
         if service in mapper:
+            msg = ("Using legacy backup service configuration like "
+                   "cinder.backup.services.* is deprecated and "
+                   "will be removed in the 'R' release. Please use "
+                   "the cinder.backup.drivers.* method instead.")
+            versionutils.report_deprecated_feature(LOG, msg)
             return mapper[service]
         return service
 
diff --git a/releasenotes/notes/deprecate-backup-service-to-driver-mapping-a3afabd4f55eca01.yaml b/releasenotes/notes/deprecate-backup-service-to-driver-mapping-a3afabd4f55eca01.yaml
new file mode 100644
index 00000000000..982fb6e3a9d
--- /dev/null
+++ b/releasenotes/notes/deprecate-backup-service-to-driver-mapping-a3afabd4f55eca01.yaml
@@ -0,0 +1,8 @@
+---
+deprecations:
+  - |
+    Backup service to driver mapping is deprecated. If you use old values
+    like 'cinder.backup.services.swift' or 'cinder.backup.services.ceph'
+    it should be changed to 'cinder.backup.drivers.swift' or
+    'cinder.backup.drivers.ceph' accordingly to get your backup service
+    working in the 'R' release.