From: Mark McLoughlin Date: Tue, 17 Jul 2012 03:35:28 +0000 (+0100) Subject: Remove unused enabled_apis flag X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ed7e05b00861e1fa3fbc21c4562a17b97d1f16f9;p=openstack-build%2Fcinder-build.git 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 8bec9bbb3..00a4bdd97 100755 --- 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 60e86999b..90ac1bfe8 100644 --- 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 a29160ce2..6b6d67b89 100644 --- 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