Remove obsolete use_local_volumes

Reading documentation, I felt on that option, but grepping the source
everywhere saw no use at all, and removing seems to be safe.

Change-Id: I0ec22bcc406402420bc06fd28c352b84a4e21b69
Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/cinder/locale/bs/LC_MESSAGES/cinder.po
index b59cd8db3d3436db41bf47fcda050e0dbbb71990..1da8bfc7099af824e5a473501c7974c5ebf4778f 100644 (file)
--- a/cinder/locale/bs/LC_MESSAGES/cinder.po
+++ b/cinder/locale/bs/LC_MESSAGES/cinder.po
@@ -7418,12 +7418,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot
index be9265796c6a5b01409b52c00b348aac976b56c1..4d73c415b01b0221465cd1e123a6d911dcfe8f78 100644 (file)
--- a/cinder/locale/cinder.pot
+++ b/cinder/locale/cinder.pot
@@ -7416,12 +7416,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/cs/LC_MESSAGES/cinder.po b/cinder/locale/cs/LC_MESSAGES/cinder.po
index ebca597162c2e401f0327697a9089001f3c0dd43..793490ce1fdaec803ef2bd2be2372a433ea04789 100644 (file)
--- a/cinder/locale/cs/LC_MESSAGES/cinder.po
+++ b/cinder/locale/cs/LC_MESSAGES/cinder.po
@@ -7499,12 +7499,6 @@ msgstr "odpověď %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/da/LC_MESSAGES/cinder.po b/cinder/locale/da/LC_MESSAGES/cinder.po
index d3e0765d1782527ecdbc85874293f9dc32359903..20bfc750928dfff4d8d3116898bb47fed7ba2140 100644 (file)
--- a/cinder/locale/da/LC_MESSAGES/cinder.po
+++ b/cinder/locale/da/LC_MESSAGES/cinder.po
@@ -7417,12 +7417,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/de/LC_MESSAGES/cinder.po b/cinder/locale/de/LC_MESSAGES/cinder.po
index e5b8feee4bd3a0d4f39914949d402355061c7321..e3fbc8b8d1cc71ec2df57a67355c6bbbae41e8c6 100644 (file)
--- a/cinder/locale/de/LC_MESSAGES/cinder.po
+++ b/cinder/locale/de/LC_MESSAGES/cinder.po
@@ -7422,12 +7422,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder.po b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
index e23929f197de5c61bded11e03d0b1590425ef261..2e6550ade7b160aafb4d3591aa4d635699705c36 100644 (file)
--- a/cinder/locale/en_AU/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
@@ -7459,12 +7459,6 @@ msgstr "response %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr "volume group %s doesn't exist"
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder.po b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
index e816526c83758eb9bbb6a7892fd046eabd5bbba4..8695b9e09f6dcdbb685fa0dcfaf9c2ff6df90d58 100644 (file)
--- a/cinder/locale/en_GB/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
@@ -7438,12 +7438,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/es/LC_MESSAGES/cinder.po b/cinder/locale/es/LC_MESSAGES/cinder.po
index 0822c7572ac073df253b0f2451aec2112b3046d1..de1787bc8855becf65c3ddec28d2d5d8b97ac5d5 100644 (file)
--- a/cinder/locale/es/LC_MESSAGES/cinder.po
+++ b/cinder/locale/es/LC_MESSAGES/cinder.po
@@ -7467,12 +7467,6 @@ msgstr "respuesta %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr "el grupo de volumenes %s no existe"
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/fr/LC_MESSAGES/cinder.po b/cinder/locale/fr/LC_MESSAGES/cinder.po
index f24fca003e68b3528f54db8073ad553514b52990..106f77d4368073265235b2a0ff7220228dfd577c 100644 (file)
--- a/cinder/locale/fr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/fr/LC_MESSAGES/cinder.po
@@ -7499,12 +7499,6 @@ msgstr "réponse %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr "Le groupe de volume %s n'existe pas"
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/it/LC_MESSAGES/cinder.po b/cinder/locale/it/LC_MESSAGES/cinder.po
index 0ac17861745cb8f274693d9242593cb9415a7db0..02af73097c6b8104db8cd3cb43005d023ff31ffa 100644 (file)
--- a/cinder/locale/it/LC_MESSAGES/cinder.po
+++ b/cinder/locale/it/LC_MESSAGES/cinder.po
@@ -7433,12 +7433,6 @@ msgstr "risposta %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/ja/LC_MESSAGES/cinder.po b/cinder/locale/ja/LC_MESSAGES/cinder.po
index c81827f2504c5431d978a3d6cef0d676a6dce21d..c905b07628ce0e5a6d0a4a65c2cd32294da83077 100644 (file)
--- a/cinder/locale/ja/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ja/LC_MESSAGES/cinder.po
@@ -7446,12 +7446,6 @@ msgstr "応答 %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr "ボリュームグループ%sが存在しません。"
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/ko/LC_MESSAGES/cinder.po b/cinder/locale/ko/LC_MESSAGES/cinder.po
index ed2ab5d9cabd05c6bee701f31597e95c8e6ec155..01a7f7b386bc92604e48a38cefb7fcbd9dc449c4 100644 (file)
--- a/cinder/locale/ko/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ko/LC_MESSAGES/cinder.po
@@ -7424,12 +7424,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
index 8357b620c6fd07d5b5dea85069756d98f416a5de..7eae377e5837a06c4d65f77afb82c26f6b0adb54 100644 (file)
--- a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
@@ -7443,12 +7443,6 @@ msgstr "resposta %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/ru/LC_MESSAGES/cinder.po b/cinder/locale/ru/LC_MESSAGES/cinder.po
index a934ed76f9a05ed6ec0d6c521a8dad6d62445651..0917f0d3f6b4cfa4e4110328828bd7d1596d2fee 100644 (file)
--- a/cinder/locale/ru/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ru/LC_MESSAGES/cinder.po
@@ -7611,12 +7611,6 @@ msgstr "ответ %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr "том группы %s не существует"
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/tl/LC_MESSAGES/cinder.po b/cinder/locale/tl/LC_MESSAGES/cinder.po
index 6161a8c26da04f9e663ffcca66727cb3e15e94eb..386fdafda8f304aa74ffaa4e76ceb1a3273a715e 100644 (file)
--- a/cinder/locale/tl/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tl/LC_MESSAGES/cinder.po
@@ -7417,12 +7417,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/tr/LC_MESSAGES/cinder.po b/cinder/locale/tr/LC_MESSAGES/cinder.po
index cfd3db0d851454161dc5fb4601928444427612a0..0afc067b8914ca0efda6a00f5467f80e8c7cadf5 100644 (file)
--- a/cinder/locale/tr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tr/LC_MESSAGES/cinder.po
@@ -7416,12 +7416,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/uk/LC_MESSAGES/cinder.po b/cinder/locale/uk/LC_MESSAGES/cinder.po
index ab3fffddb622c415e00aed90630eefffb282b943..845c6c028d4523b5f5451b8b733b5992cde17a25 100644 (file)
--- a/cinder/locale/uk/LC_MESSAGES/cinder.po
+++ b/cinder/locale/uk/LC_MESSAGES/cinder.po
@@ -7419,12 +7419,6 @@ msgstr "відповідь %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
index 53a912cd1d779f8130d9cbf13b7f706f65126316..bbea228872536c71494094dfe77432be7c52f151 100644 (file)
--- a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
@@ -7522,12 +7522,6 @@ msgstr "响应 %s"
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr "卷组 %s 不存在"
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
index 2a93395a276f3fb021e8965ef662d9f91c3eff1d..6b12bc8f207092f3791d2446a732068abcc593c5 100644 (file)
--- a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
@@ -7424,12 +7424,6 @@ msgstr ""
 msgid "Volume %s does not exist in Nexenta SA"
 msgstr ""
 
-#: cinder/volume/nexenta/volume.py:180
-msgid ""
-"Call to local_path should not happen. Verify that use_local_volumes flag "
-"is turned off."
-msgstr ""
-
 #: cinder/volume/nexenta/volume.py:202
 #, python-format
 msgid "Ignored target creation error \"%s\" while ensuring export"

diff --git a/cinder/tests/integrated/test_volumes.py b/cinder/tests/integrated/test_volumes.py
index 88828208cf5656e2465050b3af0d5af9059e03b7..e239b9db2088079c383788bcd7a57d6da4d14cfb 100755 (executable)
--- a/cinder/tests/integrated/test_volumes.py
+++ b/cinder/tests/integrated/test_volumes.py
@@ -42,7 +42,6 @@ class VolumesTest(integrated_helpers._IntegratedTestBase):
 
     def _get_flags(self):
         f = super(VolumesTest, self)._get_flags()
-        f['use_local_volumes'] = False  # Avoids calling local_path
         f['volume_driver'] = 'cinder.tests.fake_driver.LoggingVolumeDriver'
         return f
 

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 56a8aa872eef995a31b7b6fa43bcd7d59ec735f9..378259e10f4bc9bd0aa607615ccc8afc0e68f130 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -60,9 +60,6 @@ volume_manager_opts = [
     cfg.StrOpt('volume_driver',
                default='cinder.volume.driver.ISCSIDriver',
                help='Driver to use for volume creation'),
-    cfg.BoolOpt('use_local_volumes',
-                default=True,
-                help='if True, will not discover local volumes'),
     cfg.BoolOpt('volume_force_update_capabilities',
                 default=False,
                 help='if True will force update capabilities on each check'),

diff --git a/cinder/volume/nexenta/volume.py b/cinder/volume/nexenta/volume.py
index 6925c3217bf6ab9d72f3037ed20db75b6b5d140f..00e8b10f563e564e3b6a09ea68c7d54a327e6658 100644 (file)
--- a/cinder/volume/nexenta/volume.py
+++ b/cinder/volume/nexenta/volume.py
@@ -177,8 +177,6 @@ class NexentaDriver(driver.ISCSIDriver):  # pylint: disable=R0921
 
         :raise: :py:exc:`NotImplementedError`
         """
-        LOG.error(_("Call to local_path should not happen."
-                        " Verify that use_local_volumes flag is turned off."))
         raise NotImplementedError
 
     def _do_export(self, _ctx, volume, ensure=False):

diff --git a/cinder/volume/zadara.py b/cinder/volume/zadara.py
index b83996ea96eea8322d37c254005025f13b67f9b9..94be4211e57327c006b0f2722e12f26776b84c94 100644 (file)
--- a/cinder/volume/zadara.py
+++ b/cinder/volume/zadara.py
@@ -267,8 +267,6 @@ class ZadaraVPSAISCSIDriver(driver.ISCSIDriver):
 
     def local_path(self, volume):
         """Return local path to existing local volume."""
-        LOG.error(_("Call to local_path should not happen."
-                    " Verify that use_local_volumes flag is turned off."))
         raise NotImplementedError()
 
     def _xml_parse_helper(self, xml_tree, first_level, search_tuple,

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index e7979783ada3c36aedd91d1ac9095643711a24bc..5c720b404649ebd8f7cdade264ea05d35bef9556 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -566,9 +566,6 @@
 # volume_driver=cinder.volume.driver.ISCSIDriver
 #### (StrOpt) Driver to use for volume creation
 
-# use_local_volumes=true
-#### (BoolOpt) if True, will not discover local volumes
-
 # volume_force_update_capabilities=false
 #### (BoolOpt) if True will force update capabilities on each check