summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/compute/disk.py4
-rw-r--r--nova/flags.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/disk.py b/nova/compute/disk.py
index d762b8087..9ba827519 100644
--- a/nova/compute/disk.py
+++ b/nova/compute/disk.py
@@ -134,8 +134,8 @@ def inject_data(image, key=None, net=None, partition=None, execute=None):
else:
mapped_device = device
- # We can only loopback mount raw images. If the device isn't there,
- # it's normally because it's a .vmdk or a .vdi etc
+ # We can only loopback mount raw images. If the device isn't there,
+ # it's normally because it's a .vmdk or a .vdi etc
if not os.path.exists(mapped_device):
raise exception.Error('Mapped device was not found (we can'
' only inject raw disk images): %s' %
diff --git a/nova/flags.py b/nova/flags.py
index cf481b55f..a61033201 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -237,7 +237,7 @@ DEFINE_string('default_ramdisk', 'ari-11111',
DEFINE_string('default_instance_type', 'm1.small',
'default instance type to use, testing only')
DEFINE_string('null_kernel', 'aki-00000000',
- 'kernel image that indicates not to use a kernel, '
+ 'kernel image that indicates not to use a kernel,'
' but to use a raw disk image instead')
DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server')