From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Thu, 18 Jul 2013 07:42:34 +0000 (+0900)
Subject: Fix duplicate config options
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e909cfd67eceea396c63acd7563bed1f5f9979f4;p=openstack-build%2Fcinder-build.git

Fix duplicate config options

This is causing an error in the config file tool generator.
Removed them since they are registered in cinder.api.common

Change-Id: I23988d5133bbb95637dd9514813009ea8b460982
---

diff --git a/cinder/common/config.py b/cinder/common/config.py
index 0273f8661..32b6092a3 100644
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -138,15 +138,6 @@ global_opts = [
     cfg.MultiStrOpt('osapi_volume_extension',
                     default=['cinder.api.contrib.standard_extensions'],
                     help='osapi volume extension to load'),
-    cfg.StrOpt('osapi_volume_base_URL',
-               default=None,
-               help='Base URL that will be presented to users in links '
-                    'to the OpenStack Volume API',
-               deprecated_name='osapi_compute_link_prefix'),
-    cfg.IntOpt('osapi_max_limit',
-               default=1000,
-               help='the maximum number of items returned in a single '
-                    'response from a collection resource'),
     cfg.StrOpt('volume_manager',
                default='cinder.volume.manager.VolumeManager',
                help='full class name for the Manager for volume'),