Correcting improper use of the word 'an'.

Change-Id: I032509539c61f2f5fda2001e2db5a3298e30c561

7 files changed, 12 insertions, 12 deletions

diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 96118eb76..1ad6162a1 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -1756,7 +1756,7 @@
 # value)
 #hyperv_attaching_volume_retry_count=10
 
-# The seconds to wait between an volume attachment attempt
+# The seconds to wait between a volume attachment attempt
 # (integer value)
 #hyperv_wait_between_attach_retry=5
 
@@ -2476,7 +2476,7 @@
 #
 
 # Do not set this out of dev/test environments. If a node does
-# not have an fixed PXE IP address, volumes are exported with
+# not have a fixed PXE IP address, volumes are exported with
 # globally opened ACL (boolean value)
 #use_unsafe_iscsi=false
 
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py
index fa7836b37..1c053ea59 100644
--- a/nova/api/openstack/compute/contrib/admin_actions.py
+++ b/nova/api/openstack/compute/contrib/admin_actions.py
@@ -130,7 +130,7 @@ class AdminActionsController(wsgi.Controller):
 
     @wsgi.action('resetNetwork')
     def _reset_network(self, req, id, body):
-        """Permit admins to reset networking on an server."""
+        """Permit admins to reset networking on a server."""
         context = req.environ['nova.context']
         authorize(context, 'resetNetwork')
         try:
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 7b69c7a36..4d08caf8b 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -482,7 +482,7 @@ class FloatingIP(object):
     @wrap_check_policy
     def deallocate_floating_ip(self, context, address,
                                affect_auto_assigned=False):
-        """Returns an floating ip to the pool."""
+        """Returns a floating ip to the pool."""
         floating_ip = self.db.floating_ip_get_by_address(context, address)
 
         # handle auto_assigned
diff --git a/nova/virt/baremetal/volume_driver.py b/nova/virt/baremetal/volume_driver.py
index 2e6f82b93..0a05dfedd 100644
--- a/nova/virt/baremetal/volume_driver.py
+++ b/nova/virt/baremetal/volume_driver.py
@@ -31,7 +31,7 @@ opts = [
     cfg.BoolOpt('use_unsafe_iscsi',
                  default=False,
                  help='Do not set this out of dev/test environments. '
-                      'If a node does not have an fixed PXE IP address, '
+                      'If a node does not have a fixed PXE IP address, '
                       'volumes are exported with globally opened ACL'),
     cfg.StrOpt('iscsi_iqn_prefix',
                default='iqn.2010-10.org.openstack.baremetal',
diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py
index 200236233..192d6834c 100644
--- a/nova/virt/hyperv/volumeops.py
+++ b/nova/virt/hyperv/volumeops.py
@@ -37,7 +37,7 @@ hyper_volumeops_opts = [
         help='The number of times we retry on attaching volume '),
     cfg.IntOpt('hyperv_wait_between_attach_retry',
         default=5,
-        help='The seconds to wait between an volume attachment attempt'),
+        help='The seconds to wait between a volume attachment attempt'),
     cfg.BoolOpt('force_volumeutils_v1',
         default=False,
         help='Force volumeutils v1'),
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 557818a99..8f030c423 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -1973,7 +1973,7 @@ class LibvirtDriver(driver.ComputeDriver):
 
     def get_interfaces(self, xml):
         """
-        Note that this function takes an domain xml.
+        Note that this function takes a domain xml.
 
         Returns a list of all network interfaces for this instance.
         """
diff --git a/nova/virt/xenapi/pool_states.py b/nova/virt/xenapi/pool_states.py
index 5bf326117..138f84831 100644
--- a/nova/virt/xenapi/pool_states.py
+++ b/nova/virt/xenapi/pool_states.py
@@ -19,10 +19,10 @@
 
 A pool may be 'created', in which case the admin has triggered its
 creation, but the underlying hypervisor pool has not actually being set up
-yet. An pool may be 'changing', meaning that the underlying hypervisor
-pool is being setup. An pool may be 'active', in which case the underlying
-hypervisor pool is up and running. An pool may be 'dismissed' when it has
-no hosts and it has been deleted. An pool may be in 'error' in all other
+yet. A pool may be 'changing', meaning that the underlying hypervisor
+pool is being setup. A pool may be 'active', in which case the underlying
+hypervisor pool is up and running. A pool may be 'dismissed' when it has
+no hosts and it has been deleted. A pool may be in 'error' in all other
 cases.
 A 'created' pool becomes 'changing' during the first request of
 adding a host. During a 'changing' status no other requests will be accepted;
@@ -34,7 +34,7 @@ All other operations (e.g. add/remove hosts) that succeed will keep the
 pool in the 'active' state. If a number of continuous requests fail,
 an 'active' pool goes into an 'error' state. To recover from such a state,
 admin intervention is required. Currently an error state is irreversible,
-that is, in order to recover from it an pool must be deleted.
+that is, in order to recover from it a pool must be deleted.
 """
 
 CREATED = 'created'