From 7e2b93acc59dea81d52684f7f659fcff32507e14 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 23 Oct 2012 19:30:48 -0700
Subject: removes the nova-volume code from nova

This removes the majority of the nova-volume code from the codebase.
It updates relevent config options to default to cinder. It updates a
number of existing tests that were depending on code that was removed.

A few things still need to be removed:

 * volume/driver.py & volume/iscsi.py
   These files are used by the libvirt volume driver tests. These
   tests should be updated to mock the relevant calls.

 * scheduler/simple.py & scheduler/multi.py
   These files should no longer be necessary so they can be removed
   in a subsequent patch

 * exception.py cleanup
   Once the above files are removed there are a number of unused
   exceptions which can be removed

 * database calls and database tables
   The database calls have not been removed and the tables have not
   been dropped. This can be done in a separate migration

 * additional config options and nova.conf.sample
   There may be a few extra config options that can be removed and the
   conf sample can be regenerated

Implements bp delete-nova-volume

Change-Id: I0b540e54dbabd26901a7530035a38583bb521fda
---
 nova/flags.py | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'nova/flags.py')

diff --git a/nova/flags.py b/nova/flags.py
index 3927e8f88..03e607c02 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -159,9 +159,6 @@ global_opts = [
     cfg.StrOpt('scheduler_topic',
                default='scheduler',
                help='the topic scheduler nodes listen on'),
-    cfg.StrOpt('volume_topic',
-               default='volume',
-               help='the topic volume nodes listen on'),
     cfg.StrOpt('network_topic',
                default='network',
                help='the topic network nodes listen on'),
@@ -169,7 +166,7 @@ global_opts = [
                 default=True,
                 help='whether to rate limit the api'),
     cfg.ListOpt('enabled_apis',
-                default=['ec2', 'osapi_compute', 'osapi_volume', 'metadata'],
+                default=['ec2', 'osapi_compute', 'metadata'],
                 help='a list of APIs to enable by default'),
     cfg.StrOpt('ec2_host',
                default='$my_ip',
@@ -197,16 +194,6 @@ global_opts = [
                       'nova.api.openstack.compute.contrib.standard_extensions'
                       ],
                     help='osapi compute extension to load'),
-    cfg.ListOpt('osapi_volume_ext_list',
-                default=[],
-                help='Specify list of extensions to load when using osapi_'
-                     'volume_extension option with nova.api.openstack.'
-                     'volume.contrib.select_extensions'),
-    cfg.MultiStrOpt('osapi_volume_extension',
-                    default=[
-                      'nova.api.openstack.volume.contrib.standard_extensions'
-                      ],
-                    help='osapi volume extension to load'),
     cfg.StrOpt('osapi_path',
                default='/v1.1/',
                help='the path prefix used to call the openstack api server'),
@@ -281,9 +268,6 @@ global_opts = [
     cfg.StrOpt('network_manager',
                default='nova.network.manager.VlanManager',
                help='full class name for the Manager for network'),
-    cfg.StrOpt('volume_manager',
-               default='nova.volume.manager.VolumeManager',
-               help='full class name for the Manager for volume'),
     cfg.StrOpt('scheduler_manager',
                default='nova.scheduler.manager.SchedulerManager',
                help='full class name for the Manager for scheduler'),
@@ -382,7 +366,7 @@ global_opts = [
                 default='nova.network.api.API',
                 help='The full class name of the network API class to use'),
     cfg.StrOpt('volume_api_class',
-                default='nova.volume.api.API',
+                default='nova.volume.cinder.API',
                 help='The full class name of the volume API class to use'),
     cfg.StrOpt('security_group_handler',
                default='nova.network.sg.NullSecurityGroupHandler',
-- 
cgit