diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/cinder/locale/bs/LC_MESSAGES/cinder.po index b59cd8db3d3..1da8bfc7099 100644 --- 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 be9265796c6..4d73c415b01 100644 --- 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 ebca597162c..793490ce1fd 100644 --- 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 d3e0765d178..20bfc750928 100644 --- 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 e5b8feee4bd..e3fbc8b8d1c 100644 --- 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 e23929f197d..2e6550ade7b 100644 --- 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 e816526c837..8695b9e09f6 100644 --- 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 0822c7572ac..de1787bc885 100644 --- 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 f24fca003e6..106f77d4368 100644 --- 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 0ac17861745..02af73097c6 100644 --- 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 c81827f2504..c905b07628c 100644 --- 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 ed2ab5d9cab..01a7f7b386b 100644 --- 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 8357b620c6f..7eae377e583 100644 --- 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 a934ed76f9a..0917f0d3f6b 100644 --- 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 6161a8c26da..386fdafda8f 100644 --- 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 cfd3db0d851..0afc067b891 100644 --- 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 ab3fffddb62..845c6c028d4 100644 --- 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 53a912cd1d7..bbea2288725 100644 --- 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 2a93395a276..6b12bc8f207 100644 --- 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 88828208cf5..e239b9db208 100755 --- 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 56a8aa872ee..378259e10f4 100644 --- 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 6925c3217bf..00e8b10f563 100644 --- 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 b83996ea96e..94be4211e57 100644 --- 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 e7979783ada..5c720b40464 100644 --- 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