Merge "Fixing default for boot from volume (from /dev/vda to vda)"

horizon/horizon/dashboards/nova/images_and_snapshots/images/forms.py

@@ -104,7 +104,9 @@ class LaunchForm(forms.SelfHandlingForm):
                                help_text=_("Volume to boot from."))
     device_name = forms.CharField(label=_("Device Name"),
                                   required=False,
-                                  initial="/dev/vda")
+                                  initial="vda",
+                                  help_text=_("Volume mount point (e.g. 'vda' "
+                                              "mounts at '/dev/vda')."))
     delete_on_terminate = forms.BooleanField(
             label=_("Delete on Terminate"),
             initial=False,

horizon/horizon/dashboards/nova/images_and_snapshots/images/tests.py

@@ -118,7 +118,7 @@ class ImageViewTests(test.BaseViewTests):
         SERVER_NAME = 'serverName'
         USER_DATA = 'userData'
         volume = self.volumes[0].id
-        device_name = '/dev/vda'
+        device_name = 'vda'
         BLOCK_DEVICE_MAPPING = {device_name: "1:::0"}
 
         form_data = {'method': 'LaunchForm',

horizon/horizon/tests/api_tests/nova.py

@@ -273,7 +273,7 @@ class ComputeApiTests(APITestCase):
         USER_DATA = {'nuts': 'berries'}
         KEY = 'user'
         SECGROUP = self.mox.CreateMock(api.SecurityGroup)
-        BLOCK_DEVICE_MAPPING = {'/dev/vda': '1:::0'}
+        BLOCK_DEVICE_MAPPING = {'vda': '1:::0'}
 
         novaclient = self.stub_novaclient()
         novaclient.servers = self.mox.CreateMockAnything()