diff --git a/nova/api/openstack/api_version_request.py b/nova/api/openstack/api_version_request.py
index c8200a8704f0..4038e2418c8b 100644
--- a/nova/api/openstack/api_version_request.py
+++ b/nova/api/openstack/api_version_request.py
@@ -101,7 +101,7 @@ REST_API_VERSION_HISTORY = """REST API Version History:
 
 # The minimum and maximum versions of the API supported
 # The default api version request is defined to be the
-# the minimum version of the API supported.
+# minimum version of the API supported.
 # Note(cyeoh): This only applies for the v2.1 API once microversions
 # support is fully merged. It does not affect the V2 API.
 _MIN_API_VERSION = "2.1"
diff --git a/nova/cmd/status.py b/nova/cmd/status.py
index d8003d45e05e..f24760afd1da 100644
--- a/nova/cmd/status.py
+++ b/nova/cmd/status.py
@@ -156,8 +156,8 @@ class UpgradeCommands(object):
             # This may be a fresh install in which case there may not be any
             # compute_nodes in the cell database if the nova-compute service
             # hasn't started yet to create those records. So let's query the
-            # the cell database for compute_nodes records and if we find at
-            # least one it's a failure.
+            # cell database for compute_nodes records and if we find at least
+            # one it's a failure.
             num_computes = self._count_compute_nodes()
             if num_computes > 0:
                 msg = _('No host mappings found but there are compute nodes. '
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index 427e27fbb825..94933cf10742 100644
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -701,8 +701,8 @@ def _set_passwd(username, admin_passwd, passwd_data, shadow_data):
         msg = _('User %(username)s not found in password file.')
         raise exception.NovaException(msg % username)
 
-    # update password in the shadow file.It's an error if the
-    # the user doesn't exist.
+    # update password in the shadow file. It's an error if the
+    # user doesn't exist.
     new_shadow = list()
     found = False
     for entry in s_file:
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index b9460a9dbc02..f9310f2e3bb4 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -948,9 +948,9 @@ class LibvirtDriver(driver.ComputeDriver):
                 retry = False
 
         # FIXME(wangpan): if the instance is booted again here, such as the
-        #                 the soft reboot operation boot it here, it will
-        #                 become "running deleted", should we check and destroy
-        #                 it at the end of this method?
+        #                 soft reboot operation boot it here, it will become
+        #                 "running deleted", should we check and destroy it
+        #                 at the end of this method?
 
         # NOTE(vish): we disconnect from volumes regardless
         block_device_mapping = driver.block_device_info_get_mapping(