Fix the bug of "Error spelling of 'explicitely'"
The word "explicitely" should be spelled as "explicitly". So it is changed. (df) Ran spell-check on entire file and fixed a few more misspellings. Change-Id: I25d2accc2e0a1aaff71011944a62dadceb508b47 Closes-Bug: #1501202
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
filters_path=/etc/nova/rootwrap.d,/usr/share/nova/rootwrap
|
filters_path=/etc/nova/rootwrap.d,/usr/share/nova/rootwrap
|
||||||
|
|
||||||
# List of directories to search executables in, in case filters do not
|
# List of directories to search executables in, in case filters do not
|
||||||
# explicitely specify a full path (separated by ',')
|
# explicitly specify a full path (separated by ',')
|
||||||
# If not specified, defaults to system PATH environment variable.
|
# If not specified, defaults to system PATH environment variable.
|
||||||
# These directories MUST all be only writeable by root !
|
# These directories MUST all be only writeable by root !
|
||||||
exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin
|
exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin
|
||||||
|
@@ -135,7 +135,7 @@ class InstanceGroup(base.NovaPersistentObject, base.NovaObject,
|
|||||||
# InstanceGroup.add_members() method is called, which adds the mapping
|
# InstanceGroup.add_members() method is called, which adds the mapping
|
||||||
# table entries.
|
# table entries.
|
||||||
# So, since the only way to have hosts in the updates is to set that
|
# So, since the only way to have hosts in the updates is to set that
|
||||||
# field explicitely, we prefer to raise an Exception so the developer
|
# field explicitly, we prefer to raise an Exception so the developer
|
||||||
# knows he has to call obj_reset_changes(['hosts']) right after setting
|
# knows he has to call obj_reset_changes(['hosts']) right after setting
|
||||||
# the field.
|
# the field.
|
||||||
if 'hosts' in updates:
|
if 'hosts' in updates:
|
||||||
|
@@ -134,7 +134,7 @@ class PciDevice(base.NovaPersistentObject, base.NovaObject):
|
|||||||
setattr(self, k, v)
|
setattr(self, k, v)
|
||||||
else:
|
else:
|
||||||
# Note (yjiang5) extra_info.update does not update
|
# Note (yjiang5) extra_info.update does not update
|
||||||
# obj_what_changed, set it explicitely
|
# obj_what_changed, set it explicitly
|
||||||
extra_info = self.extra_info
|
extra_info = self.extra_info
|
||||||
extra_info.update({k: v})
|
extra_info.update({k: v})
|
||||||
self.extra_info = extra_info
|
self.extra_info = extra_info
|
||||||
|
@@ -726,7 +726,7 @@ class VMOps(object):
|
|||||||
if not type_.startswith('/dev'):
|
if not type_.startswith('/dev'):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Convert device name to userdevice number, e.g. /dev/xvdb -> 1
|
# Convert device name to user device number, e.g. /dev/xvdb -> 1
|
||||||
userdevice = ord(block_device.strip_prefix(type_)) - ord('a')
|
userdevice = ord(block_device.strip_prefix(type_)) - ord('a')
|
||||||
vm_utils.create_vbd(self._session, vm_ref, vdi_info['ref'],
|
vm_utils.create_vbd(self._session, vm_ref, vdi_info['ref'],
|
||||||
userdevice, bootable=False,
|
userdevice, bootable=False,
|
||||||
@@ -1179,7 +1179,7 @@ class VMOps(object):
|
|||||||
def migrate_disk_and_power_off(self, context, instance, dest,
|
def migrate_disk_and_power_off(self, context, instance, dest,
|
||||||
flavor, block_device_info):
|
flavor, block_device_info):
|
||||||
"""Copies a VHD from one host machine to another, possibly
|
"""Copies a VHD from one host machine to another, possibly
|
||||||
resizing filesystem before hand.
|
resizing filesystem beforehand.
|
||||||
|
|
||||||
:param instance: the instance that owns the VHD in question.
|
:param instance: the instance that owns the VHD in question.
|
||||||
:param dest: the destination host machine.
|
:param dest: the destination host machine.
|
||||||
@@ -1524,7 +1524,7 @@ class VMOps(object):
|
|||||||
instance=instance)
|
instance=instance)
|
||||||
# NOTE(alaski): There should not be a block device mapping here,
|
# NOTE(alaski): There should not be a block device mapping here,
|
||||||
# but if there is it very likely means there was an error cleaning
|
# but if there is it very likely means there was an error cleaning
|
||||||
# it up previously and there is now an orphaned sr/pbd. This will
|
# it up previously and there is now an orphaned sr/pbd. This will
|
||||||
# prevent both volume and instance deletes from completing.
|
# prevent both volume and instance deletes from completing.
|
||||||
bdms = block_device_info['block_device_mapping'] or []
|
bdms = block_device_info['block_device_mapping'] or []
|
||||||
if not bdms:
|
if not bdms:
|
||||||
@@ -1683,12 +1683,12 @@ class VMOps(object):
|
|||||||
self._session.call_xenapi("task.cancel", task_ref)
|
self._session.call_xenapi("task.cancel", task_ref)
|
||||||
|
|
||||||
def poll_rebooting_instances(self, timeout, instances):
|
def poll_rebooting_instances(self, timeout, instances):
|
||||||
"""Look for expirable rebooting instances.
|
"""Look for rebooting instances that can be expired.
|
||||||
|
|
||||||
- issue a "hard" reboot to any instance that has been stuck in a
|
- issue a "hard" reboot to any instance that has been stuck in a
|
||||||
reboot state for >= the given timeout
|
reboot state for >= the given timeout
|
||||||
"""
|
"""
|
||||||
# NOTE(jk0): All existing clean_reboot tasks must be cancelled before
|
# NOTE(jk0): All existing clean_reboot tasks must be canceled before
|
||||||
# we can kick off the hard_reboot tasks.
|
# we can kick off the hard_reboot tasks.
|
||||||
self._cancel_stale_tasks(timeout, 'VM.clean_reboot')
|
self._cancel_stale_tasks(timeout, 'VM.clean_reboot')
|
||||||
|
|
||||||
@@ -1925,7 +1925,7 @@ class VMOps(object):
|
|||||||
hostname = 'RESCUE-%s' % hostname
|
hostname = 'RESCUE-%s' % hostname
|
||||||
|
|
||||||
if instance['os_type'] == "windows":
|
if instance['os_type'] == "windows":
|
||||||
# NOTE(jk0): Windows hostnames can only be <= 15 chars.
|
# NOTE(jk0): Windows host names can only be <= 15 chars.
|
||||||
hostname = hostname[:15]
|
hostname = hostname[:15]
|
||||||
|
|
||||||
LOG.debug("Injecting hostname (%s) into xenstore", hostname,
|
LOG.debug("Injecting hostname (%s) into xenstore", hostname,
|
||||||
@@ -1957,11 +1957,10 @@ class VMOps(object):
|
|||||||
|
|
||||||
def _read_from_xenstore(self, instance, path, ignore_missing_path=True,
|
def _read_from_xenstore(self, instance, path, ignore_missing_path=True,
|
||||||
vm_ref=None):
|
vm_ref=None):
|
||||||
"""Reads the passed location from xenstore for the given vm.
|
"""Reads the passed location from xenstore for the given vm. Missing
|
||||||
Missing paths are ignored, unless explicitely stated not to
|
paths are ignored, unless explicitly stated not to, which causes
|
||||||
which will cause and exception to be raised by xenstore.
|
xenstore to raise an exception. A XenAPIPlugin.PluginError is raised
|
||||||
A XenAPIPlugin.PluginError will be raised if any error is
|
if any error is encountered in the read process.
|
||||||
encountered in the read process.
|
|
||||||
"""
|
"""
|
||||||
# NOTE(sulo): These need to be string for valid field type
|
# NOTE(sulo): These need to be string for valid field type
|
||||||
# for xapi.
|
# for xapi.
|
||||||
@@ -2204,7 +2203,7 @@ class VMOps(object):
|
|||||||
present but not reported, try to fake the info for live-migration.
|
present but not reported, try to fake the info for live-migration.
|
||||||
"""
|
"""
|
||||||
if self._pv_driver_version_reported(instance, vm_ref):
|
if self._pv_driver_version_reported(instance, vm_ref):
|
||||||
# Since driver version is reported we dont need to do anything
|
# Since driver version is reported we do not need to do anything
|
||||||
return
|
return
|
||||||
|
|
||||||
if self._pv_device_reported(instance, vm_ref):
|
if self._pv_device_reported(instance, vm_ref):
|
||||||
|
Reference in New Issue
Block a user