Remove useless storage_availability_zone import

Config 'storage_availability_zone' have been removed from cinder.volume.manager
long time ago, but Still been imported by cinder.volume.api and
cinder.consistencygroup.api.

Closes-Bug: #1426205
Change-Id: I9595f69f3d9cdf43002ccb0ed2d52f4b021b5448

diff --git a/cinder/consistencygroup/api.py b/cinder/consistencygroup/api.py
index 9c90c0a38671a63274597dd53047053f8c1bd0f8..7d049af0f52cfa4c6984b0f8e57fa5df7fa47a7f 100644 (file)
--- a/cinder/consistencygroup/api.py
+++ b/cinder/consistencygroup/api.py
@@ -37,7 +37,6 @@ from cinder.volume import volume_types
 
 
 CONF = cfg.CONF
-CONF.import_opt('storage_availability_zone', 'cinder.volume.manager')
 
 LOG = logging.getLogger(__name__)
 CGQUOTAS = quota.CGQUOTAS

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 5726c9416116a54f757cb328432f44aca7aff329..60a7864c9472436549f682b91a048bba566dd395 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -71,7 +71,6 @@ CONF.register_opt(volume_same_az_opt)
 CONF.register_opt(az_cache_time_opt)
 
 CONF.import_opt('glance_core_properties', 'cinder.image.glance')
-CONF.import_opt('storage_availability_zone', 'cinder.volume.manager')
 
 LOG = logging.getLogger(__name__)
 QUOTAS = quota.QUOTAS