Set can_set_mount_point default to False

Patch https://review.openstack.org/#/c/59229/ only changed the default value in the local_settings.py example file. If the setting isn't defined, it still defaults to True Change-Id: Ia3525786e5eb9ec83b8057c1cb6158ab153adc59 Closes-Bug: #1255136
openstack · Dec 4, 2013 · 1b13a42 · 1b13a42
1 parent efc88d4
commit 1b13a42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/openstack_dashboard/dashboards/project/volumes/forms.py b/openstack_dashboard/dashboards/project/volumes/forms.py
@@ -291,7 +291,7 @@ def __init__(self, *args, **kwargs):
                                       "OPENSTACK_HYPERVISOR_FEATURES",
                                       {})
         can_set_mount_point = hypervisor_features.get("can_set_mount_point",
-                                                      True)
+                                                      False)
         if not can_set_mount_point:
             self.fields['device'].widget = forms.widgets.HiddenInput()
             self.fields['device'].required = False

diff --git a/openstack_dashboard/dashboards/project/volumes/tests.py b/openstack_dashboard/dashboards/project/volumes/tests.py
@@ -679,6 +679,9 @@ def test_delete_volume_error_existing_snapshot(self):
 
     @test.create_stubs({cinder: ('volume_get',), api.nova: ('server_list',)})
     def test_edit_attachments(self):
+        PREV = settings.OPENSTACK_HYPERVISOR_FEATURES['can_set_mount_point']
+        settings.OPENSTACK_HYPERVISOR_FEATURES['can_set_mount_point'] = True
+
         volume = self.volumes.first()
         servers = [s for s in self.servers.list()
                    if s.tenant_id == self.request.user.tenant_id]
@@ -697,11 +700,10 @@ def test_edit_attachments(self):
         self.assertEqual(res.status_code, 200)
         self.assertTrue(isinstance(form.fields['device'].widget,
                                    widgets.TextInput))
+        settings.OPENSTACK_HYPERVISOR_FEATURES['can_set_mount_point'] = PREV
 
     @test.create_stubs({cinder: ('volume_get',), api.nova: ('server_list',)})
     def test_edit_attachments_cannot_set_mount_point(self):
-        PREV = settings.OPENSTACK_HYPERVISOR_FEATURES['can_set_mount_point']
-        settings.OPENSTACK_HYPERVISOR_FEATURES['can_set_mount_point'] = False
 
         volume = self.volumes.first()
         servers = [s for s in self.servers.list()
@@ -717,7 +719,6 @@ def test_edit_attachments_cannot_set_mount_point(self):
         form = res.context['form']
         self.assertTrue(isinstance(form.fields['device'].widget,
                                    widgets.HiddenInput))
-        settings.OPENSTACK_HYPERVISOR_FEATURES['can_set_mount_point'] = PREV
 
     @test.create_stubs({cinder: ('volume_get',),
                         api.nova: ('server_get', 'server_list',),

diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py
@@ -115,7 +115,7 @@
 }
 
 OPENSTACK_HYPERVISOR_FEATURES = {
-    'can_set_mount_point': True,
+    'can_set_mount_point': False,
     'can_set_password': True,
 }