Remove deprecated Grizzly code.

Now that Havana development has started remove code deprecated in Grizzly.

Change-Id: Ie3e7611347c334c359dea98d759345b97c66c9c1

4 files changed, 8 insertions, 58 deletions

diff --git a/nova/virt/hyperv/vif.py b/nova/virt/hyperv/vif.py
index 8cf401908..242ca2e87 100644
--- a/nova/virt/hyperv/vif.py
+++ b/nova/virt/hyperv/vif.py
@@ -29,8 +29,7 @@ hyperv_opts = [
                default=None,
                help='External virtual switch Name, '
                     'if not provided, the first external virtual '
-                    'switch is used',
-               deprecated_group='DEFAULT'),
+                    'switch is used'),
 ]
 
 CONF = cfg.CONF
diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py
index efdcf4120..070d81b4e 100644
--- a/nova/virt/hyperv/vmops.py
+++ b/nova/virt/hyperv/vmops.py
@@ -44,22 +44,18 @@ hyperv_opts = [
     cfg.BoolOpt('limit_cpu_features',
                 default=False,
                 help='Required for live migration among '
-                     'hosts with different CPU features',
-                deprecated_group='DEFAULT'),
+                     'hosts with different CPU features'),
     cfg.BoolOpt('config_drive_inject_password',
                 default=False,
-                help='Sets the admin password in the config drive image',
-                deprecated_group='DEFAULT'),
+                help='Sets the admin password in the config drive image'),
     cfg.StrOpt('qemu_img_cmd',
                default="qemu-img.exe",
                help='qemu-img is used to convert between '
-                    'different image types',
-               deprecated_group='DEFAULT'),
+                    'different image types'),
     cfg.BoolOpt('config_drive_cdrom',
                 default=False,
                 help='Attaches the Config Drive image as a cdrom drive '
-                     'instead of a disk drive',
-                deprecated_group='DEFAULT')
+                     'instead of a disk drive')
 ]
 
 CONF = cfg.CONF
diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py
index 74953435a..1b6f10d16 100644
--- a/nova/virt/hyperv/volumeops.py
+++ b/nova/virt/hyperv/volumeops.py
@@ -36,18 +36,13 @@ LOG = logging.getLogger(__name__)
 hyper_volumeops_opts = [
     cfg.IntOpt('volume_attach_retry_count',
                default=10,
-               help='The number of times to retry to attach a volume',
-               deprecated_name='hyperv_attaching_volume_retry_count',
-               deprecated_group='DEFAULT'),
+               help='The number of times to retry to attach a volume'),
     cfg.IntOpt('volume_attach_retry_interval',
                default=5,
-               help='Interval between volume attachment attempts, in seconds',
-               deprecated_name='hyperv_wait_between_attach_retry',
-               deprecated_group='DEFAULT'),
+               help='Interval between volume attachment attempts, in seconds'),
     cfg.BoolOpt('force_volumeutils_v1',
                 default=False,
-                help='Force volumeutils v1',
-                deprecated_group='DEFAULT'),
+                help='Force volumeutils v1'),
 ]
 
 CONF = cfg.CONF
diff --git a/nova/virt/libvirt/volume_nfs.py b/nova/virt/libvirt/volume_nfs.py
deleted file mode 100755
index 668969ed2..000000000
--- a/nova/virt/libvirt/volume_nfs.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2012 NetApp, Inc.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""Deprecated file, kept for back-compat only. To be removed in Hxxxx."""
-
-from nova.openstack.common import log as logging
-from nova.virt.libvirt import volume
-
-LOG = logging.getLogger(__name__)
-
-
-class NfsVolumeDriver(volume.LibvirtNFSVolumeDriver):
-    """Deprecated driver for NFS, renamed to LibvirtNFSVolumeDriver
-       and moved into the main volume.py module. Kept for backwards
-       compatibility in the Grizzly cycle to give users opportunity
-       to configure before its removal in the Hxxxx cycle."""
-
-    def __init__(self, *args, **kwargs):
-        super(NfsVolumeDriver,
-              self).__init__(*args, **kwargs)
-        LOG.deprecated(
-            _("The nova.virt.libvirt.volume_nfs.NfsVolumeDriver "
-              "class is deprecated and will be removed in the "
-              "Hxxxx release. Please update nova.conf so that "
-              "the 'libvirt_volume_drivers' parameter refers to "
-              "nova.virt.libvirt.volume.LibvirtNFSVolumeDriver."))