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>
2012-11-13 15:26:48 +01:00 · 2012-11-13 15:26:48 +01:00 · 4b8670aa74
commit 4b8670aa74
parent db592705d9
24 changed files with 0 additions and 125 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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

--- 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'),
--- 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):
--- 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,
--- 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