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 f0a90f7b29141e56bfcd99f99649669b9422e7c7..70997f6527820e5f9e20b462fb0457d9f0b7772f 100644 (file)
--- 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 28ad334004915a611e054b0378175a130c23c5bf..2922d0870a3614eb35b2ea53148815623c4dc855 100644 (file)
--- 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'),