From: Mike Perez <thingee@gmail.com>
Date: Mon, 27 Jul 2015 20:44:27 +0000 (-0700)
Subject: Remove deprecated config options for Liberty
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cb0c45ca1be240b51eb9c6af451e5257d2302352;p=openstack-build%2Fcinder-build.git

Remove deprecated config options for Liberty

num_iscsi_scan_tries and backup_service have been deprecated for at
least two releases or longer.

Change-Id: I4c99e0aa06fd6ff8fc38dda29e8132e0edd69257
UpgradeImpact: removed num_iscsi_scan_tries and backup_service conf opts
---

diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py
index f0a90f7b2..70997f652 100644
--- a/cinder/backup/manager.py
+++ b/cinder/backup/manager.py
@@ -57,8 +57,7 @@ LOG = logging.getLogger(__name__)
 backup_manager_opts = [
     cfg.StrOpt('backup_driver',
                default='cinder.backup.drivers.swift',
-               help='Driver to use for backups.',
-               deprecated_name='backup_service'),
+               help='Driver to use for backups.',)
 ]
 
 # This map doesn't need to be extended in the future since it's only
diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 28ad33400..2922d0870 100644
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -67,7 +67,6 @@ volume_opts = [
                default=3260,
                help='The port that the iSCSI daemon is listening on'),
     cfg.IntOpt('num_volume_device_scan_tries',
-               deprecated_name='num_iscsi_scan_tries',
                default=3,
                help='The maximum number of times to rescan targets'
                     ' to find volume'),