Remove unused enabled_apis flag

This is only useful in the context of Nova where there are multiple
APIs.

Change-Id: I2339a36b45166a24825882e3e35dd00a2dfb6b27

diff --git a/bin/cinder-all b/bin/cinder-all
index 8bec9bbb39b8c84358078e1ef90a2002ab875010..00a4bdd97542013f02317af68e97c0a55e61d38e 100755 (executable)
--- a/bin/cinder-all
+++ b/bin/cinder-all
@@ -55,11 +55,10 @@ if __name__ == '__main__':
     utils.monkey_patch()
     servers = []
     # cinder-api
-    for api in flags.FLAGS.enabled_apis:
-        try:
-            servers.append(service.WSGIService(api))
-        except (Exception, SystemExit):
-            logging.exception(_('Failed to load %s') % '%s-api' % api)
+    try:
+        servers.append(service.WSGIService('osapi_volume'))
+    except (Exception, SystemExit):
+        logging.exception(_('Failed to load %s') % '%s-api' % api)
 
     for binary in ['cinder-volume', 'cinder-scheduler']:
         try:

diff --git a/cinder/flags.py b/cinder/flags.py
index 60e86999b79f6cf09bce8987b2f78bec6156e1ca..90ac1bfe86693cb43cafdba6533095f33d9cd3b5 100644 (file)
--- a/cinder/flags.py
+++ b/cinder/flags.py
@@ -198,9 +198,6 @@ global_opts = [
     cfg.BoolOpt('api_rate_limit',
                 default=True,
                 help='whether to rate limit the api'),
-    cfg.ListOpt('enabled_apis',
-                default=['osapi_volume'],
-                help='a list of APIs to enable by default'),
     cfg.ListOpt('osapi_volume_ext_list',
                 default=[],
                 help='Specify list of extensions to load when using osapi_'

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index a29160ce279f664cb515afdc7fec181d690576ca..6b6d67b89a4ebad6a87020ab09512a3a76695103 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -63,8 +63,6 @@
 # ec2_scheme="http"
 ###### (BoolOpt) Allows use of instance password during server creation
 # enable_instance_password=true
-###### (ListOpt) a list of APIs to enable by default
-# enabled_apis="ec2,osapi_compute,osapi_volume,metadata"
 ###### (BoolOpt) If passed, use fake network devices and addresses
 # fake_network=false
 ###### (BoolOpt) If passed, use a fake RabbitMQ provider