diff --git a/api-guide/source/down_cells.rst b/api-guide/source/down_cells.rst index 25da06f8b695..bd5980d4d3d8 100644 --- a/api-guide/source/down_cells.rst +++ b/api-guide/source/down_cells.rst @@ -243,7 +243,7 @@ behavior are described below: in the boot-from-volume case, this value will be an empty string. - flavor: The flavor details of the server. - availability_zone: The availability_zone of the server if it was specified - during during boot time and "UNKNOWN" otherwise. + during boot time and "UNKNOWN" otherwise. - power_state: Its value will be 0 (``NOSTATE``). - links: Links to the servers in question. - server_groups: The UUIDs of the server groups to which the server belongs. diff --git a/doc/source/admin/configuration/hypervisor-xen-libvirt.rst b/doc/source/admin/configuration/hypervisor-xen-libvirt.rst index 795e83e8e84b..5ffef048dd50 100644 --- a/doc/source/admin/configuration/hypervisor-xen-libvirt.rst +++ b/doc/source/admin/configuration/hypervisor-xen-libvirt.rst @@ -160,7 +160,7 @@ Use the following as a guideline for configuring Xen for use in OpenStack: $ openstack image set --property hypervisor_type=xen vm_mode=hvm IMAGE - For more more information on image metadata, refer to the `OpenStack Virtual + For more information on image metadata, refer to the `OpenStack Virtual Image Guide `__. #. **Libguestfs file injection**: OpenStack compute nodes can use `libguestfs diff --git a/nova/api/validation/parameter_types.py b/nova/api/validation/parameter_types.py index 11269b174cbf..caeb2d7eb055 100644 --- a/nova/api/validation/parameter_types.py +++ b/nova/api/validation/parameter_types.py @@ -119,7 +119,7 @@ def _build_regex_range(ws=True, invert=False, exclude=None): The inversion is useful when we want to generate a set of ranges which is everything that's not a certain class. For instance, - produce all all the non printable characters as a set of ranges. + produce all the non printable characters as a set of ranges. """ if exclude is None: exclude = [] diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index fc66425ab1b0..5b37a483003e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1824,7 +1824,7 @@ def instance_destroy(context, instance_uuid, constraint=None, if constraint is not None: query = constraint.apply(models.Instance, query) # Either in hard or soft delete, we soft delete the instance first - # to make sure that that the constraints were met. + # to make sure that the constraints were met. count = query.soft_delete() if count == 0: raise exception.ConstraintNotMet() diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index 75aca89e9bd7..36e6fb49379d 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -599,7 +599,7 @@ class IronicDriver(virt_driver.ComputeDriver): VCPU/RAM/disk. By adding just the custom RC to the existing flavor extra_specs, the periodic call to update_available_resources() will add an allocation against the custom resource class, and prevent placement - from thinking that that node is available. This code can be removed in + from thinking that node is available. This code can be removed in Queens, and will need to be updated to also alter extra_specs to zero-out the old-style standard resource classes of VCPU, MEMORY_MB, and DISK_GB. diff --git a/nova/virt/powervm/volume/fcvscsi.py b/nova/virt/powervm/volume/fcvscsi.py index 60cfe71856a2..74f7a37c7412 100644 --- a/nova/virt/powervm/volume/fcvscsi.py +++ b/nova/virt/powervm/volume/fcvscsi.py @@ -278,7 +278,7 @@ class FCVscsiVolumeAdapter(object): """Update the stg_ftsk to append the mapping to the VIOS. :param vios_uuid: The UUID of the vios for the pypowervm adapter. - :param device_name: The The hdisk device name. + :param device_name: The hdisk device name. :param tag: String tag to set on the physical volume. """ def add_func(vios_w): @@ -400,7 +400,7 @@ class FCVscsiVolumeAdapter(object): :param vm_uuid: The UUID of the VM instance :param vios_uuid: The UUID of the vios for the pypowervm adapter. - :param device_name: The The hdisk device name. + :param device_name: The hdisk device name. """ def rm_func(vios_w): LOG.info("Removing vSCSI mapping from physical volume %(dev)s "