97 files changed, 52146 insertions, 19012 deletions

diff --git a/doc/source/devref/filter_scheduler.rst b/doc/source/devref/filter_scheduler.rst
index 1a5ed11a2..4fca56736 100644
--- a/doc/source/devref/filter_scheduler.rst
+++ b/doc/source/devref/filter_scheduler.rst
@@ -73,11 +73,21 @@ There are some standard filter classes to use (:mod:`nova.scheduler.filters`):
 * |ComputeFilter| - passes all hosts that are operational and enabled.
 * |CoreFilter| - filters based on CPU core utilization. It passes hosts with
   sufficient number of CPU cores.
+* |AggregateCoreFilter| - filters hosts by CPU core number with per-aggregate
+  cpu_allocation_ratio setting. If no per-aggregate value is found, it will
+  fall back to the global default cpu_allocation_ratio. If more than one value
+  is found for a host (meaning the host is in two differenet aggregate with
+  different ratio settings), the minimum value will be used.
 * |IsolatedHostsFilter| - filter based on "image_isolated" and "host_isolated"
   flags.
 * |JsonFilter| - allows simple JSON-based grammar for selecting hosts.
 * |RamFilter| - filters hosts by their RAM. Only hosts with sufficient RAM
   to host the instance are passed.
+* |AggregateRamFilter| - filters hosts by RAM with per-aggregate
+  ram_allocation_ratio setting. If no per-aggregate value is found, it will
+  fall back to the global default ram_allocation_ratio. If more than one value
+  is found for a host (meaning the host is in two differenet aggregate with
+  different ratio settings), the minimum value will be used.
 * |SimpleCIDRAffinityFilter| - allows to put a new instance on a host within
   the same IP block.
 * |DifferentHostFilter| - allows to put the instance on a different host from a
@@ -282,9 +292,11 @@ in :mod:`nova.tests.scheduler`.
 .. |ComputeCapabilitiesFilter| replace:: :class:`ComputeCapabilitiesFilter <nova.scheduler.filters.compute_capabilities_filter.ComputeCapabilitiesFilter>`
 .. |ComputeFilter| replace:: :class:`ComputeFilter <nova.scheduler.filters.compute_filter.ComputeFilter>`
 .. |CoreFilter| replace:: :class:`CoreFilter <nova.scheduler.filters.core_filter.CoreFilter>`
+.. |AggregateCoreFilter| replace:: :class:`AggregateCoreFilter <nova.scheduler.filters.core_filter.AggregateCoreFilter>`
 .. |IsolatedHostsFilter| replace:: :class:`IsolatedHostsFilter <nova.scheduler.filters.isolated_hosts_filter>`
 .. |JsonFilter| replace:: :class:`JsonFilter <nova.scheduler.filters.json_filter.JsonFilter>`
 .. |RamFilter| replace:: :class:`RamFilter <nova.scheduler.filters.ram_filter.RamFilter>`
+.. |AggregateRamFilter| replace:: :class:`AggregateRamFilter <nova.scheduler.filters.ram_filter.AggregateRamFilter>`
 .. |SimpleCIDRAffinityFilter| replace:: :class:`SimpleCIDRAffinityFilter <nova.scheduler.filters.affinity_filter.SimpleCIDRAffinityFilter>`
 .. |GroupAntiAffinityFilter| replace:: :class:`GroupAntiAffinityFilter <nova.scheduler.filters.affinity_filter.GroupAntiAffinityFilter>`
 .. |DifferentHostFilter| replace:: :class:`DifferentHostFilter <nova.scheduler.filters.affinity_filter.DifferentHostFilter>`
diff --git a/etc/nova/policy.json b/etc/nova/policy.json
index d37ee60a4..69fbbb584 100644
--- a/etc/nova/policy.json
+++ b/etc/nova/policy.json
@@ -33,6 +33,7 @@
     "compute_extension:attach_interfaces": "",
     "compute_extension:baremetal_nodes": "rule:admin_api",
     "compute_extension:cells": "rule:admin_api",
+    "compute_extension:v3:os-cells": "rule:admin_api",
     "compute_extension:certificates": "",
     "compute_extension:v3:os-certificates": "",
     "compute_extension:cloudpipe": "rule:admin_api",
@@ -59,6 +60,7 @@
     "compute_extension:flavor_access": "",
     "compute_extension:v3:os-flavor-access": "",
     "compute_extension:flavor_disabled": "",
+    "compute_extension:v3:os-flavor-disabled": "",
     "compute_extension:flavor_rxtx": "",
     "compute_extension:flavor_swap": "",
     "compute_extension:flavorextradata": "",
@@ -78,6 +80,7 @@
     "compute_extension:hosts": "rule:admin_api",
     "compute_extension:hypervisors": "rule:admin_api",
     "compute_extension:image_size": "",
+    "compute_extension:v3:os-images": "",
     "compute_extension:instance_actions": "",
     "compute_extension:instance_actions:events": "rule:admin_api",
     "compute_extension:instance_usage_audit_log": "rule:admin_api",
@@ -101,6 +104,7 @@
     "compute_extension:security_group_default_rules": "rule:admin_api",
     "compute_extension:security_groups": "",
     "compute_extension:server_diagnostics": "rule:admin_api",
+    "compute_extension:v3:os-server-diagnostics": "rule:admin_api",
     "compute_extension:server_password": "",
     "compute_extension:server_usage": "",
     "compute_extension:services": "rule:admin_api",
diff --git a/nova/api/openstack/compute/contrib/extended_availability_zone.py b/nova/api/openstack/compute/contrib/extended_availability_zone.py
index 00765e209..6e77cd6bd 100644
--- a/nova/api/openstack/compute/contrib/extended_availability_zone.py
+++ b/nova/api/openstack/compute/contrib/extended_availability_zone.py
@@ -20,7 +20,7 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import availability_zones
+from nova import availability_zones as avail_zone
 
 authorize = extensions.soft_extension_authorizer('compute',
                                                  'extended_availability_zone')
@@ -29,8 +29,13 @@ authorize = extensions.soft_extension_authorizer('compute',
 class ExtendedAZController(wsgi.Controller):
     def _extend_server(self, context, server, instance):
         key = "%s:availability_zone" % Extended_availability_zone.alias
-        server[key] = availability_zones.get_instance_availability_zone(
-                                                            context, instance)
+        az = avail_zone.get_instance_availability_zone(context, instance)
+        if not az and instance.get('availability_zone'):
+            # Likely hasn't reached a viable compute node yet so give back the
+            # desired availability_zone that *may* exist in the instance
+            # record itself.
+            az = instance['availability_zone']
+        server[key] = az
 
     @wsgi.extends
     def show(self, req, resp_obj, id):
diff --git a/nova/api/openstack/compute/plugins/v3/cells.py b/nova/api/openstack/compute/plugins/v3/cells.py
new file mode 100644
index 000000000..e07792018
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/cells.py
@@ -0,0 +1,347 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011-2012 OpenStack Foundation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""The cells extension."""
+
+from oslo.config import cfg
+from webob import exc
+
+from nova.api.openstack import common
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+from nova.cells import rpcapi as cells_rpcapi
+from nova.compute import api as compute
+from nova import db
+from nova import exception
+from nova.openstack.common import log as logging
+from nova.openstack.common import timeutils
+
+
+LOG = logging.getLogger(__name__)
+CONF = cfg.CONF
+CONF.import_opt('name', 'nova.cells.opts', group='cells')
+CONF.import_opt('capabilities', 'nova.cells.opts', group='cells')
+
+ALIAS = "os-cells"
+authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
+
+
+def make_cell(elem):
+    elem.set('name')
+    elem.set('username')
+    elem.set('type')
+    elem.set('rpc_host')
+    elem.set('rpc_port')
+
+    caps = xmlutil.SubTemplateElement(elem, 'capabilities',
+            selector='capabilities')
+    cap = xmlutil.SubTemplateElement(caps, xmlutil.Selector(0),
+            selector=xmlutil.get_items)
+    cap.text = 1
+    make_capacity(elem)
+
+
+def make_capacity(cell):
+
+    def get_units_by_mb(capacity_info):
+        return capacity_info['units_by_mb'].items()
+
+    capacity = xmlutil.SubTemplateElement(cell, 'capacities',
+                                          selector='capacities')
+
+    ram_free = xmlutil.SubTemplateElement(capacity, 'ram_free',
+                                          selector='ram_free')
+    ram_free.set('total_mb', 'total_mb')
+    unit_by_mb = xmlutil.SubTemplateElement(ram_free, 'unit_by_mb',
+                                            selector=get_units_by_mb)
+    unit_by_mb.set('mb', 0)
+    unit_by_mb.set('unit', 1)
+
+    disk_free = xmlutil.SubTemplateElement(capacity, 'disk_free',
+                                           selector='disk_free')
+    disk_free.set('total_mb', 'total_mb')
+    unit_by_mb = xmlutil.SubTemplateElement(disk_free, 'unit_by_mb',
+                                            selector=get_units_by_mb)
+    unit_by_mb.set('mb', 0)
+    unit_by_mb.set('unit', 1)
+
+cell_nsmap = {None: wsgi.XMLNS_V10}
+
+
+class CellTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('cell', selector='cell')
+        make_cell(root)
+        return xmlutil.MasterTemplate(root, 1, nsmap=cell_nsmap)
+
+
+class CellsTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('cells')
+        elem = xmlutil.SubTemplateElement(root, 'cell', selector='cells')
+        make_cell(elem)
+        return xmlutil.MasterTemplate(root, 1, nsmap=cell_nsmap)
+
+
+class CellDeserializer(wsgi.XMLDeserializer):
+    """Deserializer to handle xml-formatted cell create requests."""
+
+    def _extract_capabilities(self, cap_node):
+        caps = {}
+        for cap in cap_node.childNodes:
+            cap_name = cap.tagName
+            caps[cap_name] = self.extract_text(cap)
+        return caps
+
+    def _extract_cell(self, node):
+        cell = {}
+        cell_node = self.find_first_child_named(node, 'cell')
+
+        extract_fns = {'capabilities': self._extract_capabilities}
+
+        for child in cell_node.childNodes:
+            name = child.tagName
+            extract_fn = extract_fns.get(name, self.extract_text)
+            cell[name] = extract_fn(child)
+        return cell
+
+    def default(self, string):
+        """Deserialize an xml-formatted cell create request."""
+        node = xmlutil.safe_minidom_parse_string(string)
+
+        return {'body': {'cell': self._extract_cell(node)}}
+
+
+def _filter_keys(item, keys):
+    """
+    Filters all model attributes except for keys
+    item is a dict
+
+    """
+    return dict((k, v) for k, v in item.iteritems() if k in keys)
+
+
+def _scrub_cell(cell, detail=False):
+    keys = ['name', 'username', 'rpc_host', 'rpc_port']
+    if detail:
+        keys.append('capabilities')
+
+    cell_info = _filter_keys(cell, keys)
+    cell_info['type'] = 'parent' if cell['is_parent'] else 'child'
+    return cell_info
+
+
+class CellsController(object):
+    """Controller for Cell resources."""
+
+    def __init__(self):
+        self.compute_api = compute.API()
+        self.cells_rpcapi = cells_rpcapi.CellsAPI()
+
+    def _get_cells(self, ctxt, req, detail=False):
+        """Return all cells."""
+        # Ask the CellsManager for the most recent data
+        items = self.cells_rpcapi.get_cell_info_for_neighbors(ctxt)
+        items = common.limited(items, req)
+        items = [_scrub_cell(item, detail=detail) for item in items]
+        return dict(cells=items)
+
+    @wsgi.serializers(xml=CellsTemplate)
+    def index(self, req):
+        """Return all cells in brief."""
+        ctxt = req.environ['nova.context']
+        authorize(ctxt)
+        return self._get_cells(ctxt, req)
+
+    @wsgi.serializers(xml=CellsTemplate)
+    def detail(self, req):
+        """Return all cells in detail."""
+        ctxt = req.environ['nova.context']
+        authorize(ctxt)
+        return self._get_cells(ctxt, req, detail=True)
+
+    @wsgi.serializers(xml=CellTemplate)
+    def info(self, req):
+        """Return name and capabilities for this cell."""
+        context = req.environ['nova.context']
+        authorize(context)
+        cell_capabs = {}
+        my_caps = CONF.cells.capabilities
+        for cap in my_caps:
+            key, value = cap.split('=')
+            cell_capabs[key] = value
+        cell = {'name': CONF.cells.name,
+                'type': 'self',
+                'rpc_host': None,
+                'rpc_port': 0,
+                'username': None,
+                'capabilities': cell_capabs}
+        return dict(cell=cell)
+
+    @wsgi.serializers(xml=CellTemplate)
+    def capacities(self, req, id=None):
+        """Return capacities for a given cell or all cells."""
+        # TODO(kaushikc): return capacities as a part of cell info and
+        # cells detail calls in v3, along with capabilities
+        context = req.environ['nova.context']
+        authorize(context)
+        try:
+            capacities = self.cells_rpcapi.get_capacities(context,
+                                                          cell_name=id)
+        except exception.CellNotFound:
+            msg = (_("Cell %(id)s not found.") % {'id': id})
+            raise exc.HTTPNotFound(explanation=msg)
+
+        return dict(cell={"capacities": capacities})
+
+    @wsgi.serializers(xml=CellTemplate)
+    def show(self, req, id):
+        """Return data about the given cell name.  'id' is a cell name."""
+        context = req.environ['nova.context']
+        authorize(context)
+        try:
+            cell = db.cell_get(context, id)
+        except exception.CellNotFound:
+            raise exc.HTTPNotFound()
+        return dict(cell=_scrub_cell(cell))
+
+    def delete(self, req, id):
+        """Delete a child or parent cell entry.  'id' is a cell name."""
+        context = req.environ['nova.context']
+        authorize(context)
+        num_deleted = db.cell_delete(context, id)
+        if num_deleted == 0:
+            raise exc.HTTPNotFound()
+        return {}
+
+    def _validate_cell_name(self, cell_name):
+        """Validate cell name is not empty and doesn't contain '!' or '.'."""
+        if not cell_name:
+            msg = _("Cell name cannot be empty")
+            LOG.error(msg)
+            raise exc.HTTPBadRequest(explanation=msg)
+        if '!' in cell_name or '.' in cell_name:
+            msg = _("Cell name cannot contain '!' or '.'")
+            LOG.error(msg)
+            raise exc.HTTPBadRequest(explanation=msg)
+
+    def _validate_cell_type(self, cell_type):
+        """Validate cell_type is 'parent' or 'child'."""
+        if cell_type not in ['parent', 'child']:
+            msg = _("Cell type must be 'parent' or 'child'")
+            LOG.error(msg)
+            raise exc.HTTPBadRequest(explanation=msg)
+
+    def _convert_cell_type(self, cell):
+        """Convert cell['type'] to is_parent boolean."""
+        if 'type' in cell:
+            self._validate_cell_type(cell['type'])
+            cell['is_parent'] = cell['type'] == 'parent'
+            del cell['type']
+        else:
+            cell['is_parent'] = False
+
+    @wsgi.serializers(xml=CellTemplate)
+    @wsgi.deserializers(xml=CellDeserializer)
+    def create(self, req, body):
+        """Create a child cell entry."""
+        context = req.environ['nova.context']
+        authorize(context)
+        if 'cell' not in body:
+            msg = _("No cell information in request")
+            LOG.error(msg)
+            raise exc.HTTPBadRequest(explanation=msg)
+        cell = body['cell']
+        if 'name' not in cell:
+            msg = _("No cell name in request")
+            LOG.error(msg)
+            raise exc.HTTPBadRequest(explanation=msg)
+        self._validate_cell_name(cell['name'])
+        self._convert_cell_type(cell)
+        cell = db.cell_create(context, cell)
+        return dict(cell=_scrub_cell(cell))
+
+    @wsgi.serializers(xml=CellTemplate)
+    @wsgi.deserializers(xml=CellDeserializer)
+    def update(self, req, id, body):
+        """Update a child cell entry.  'id' is the cell name to update."""
+        context = req.environ['nova.context']
+        authorize(context)
+        if 'cell' not in body:
+            msg = _("No cell information in request")
+            LOG.error(msg)
+            raise exc.HTTPBadRequest(explanation=msg)
+        cell = body['cell']
+        cell.pop('id', None)
+        if 'name' in cell:
+            self._validate_cell_name(cell['name'])
+        self._convert_cell_type(cell)
+        try:
+            cell = db.cell_update(context, id, cell)
+        except exception.CellNotFound:
+            raise exc.HTTPNotFound()
+        return dict(cell=_scrub_cell(cell))
+
+    def sync_instances(self, req, body):
+        """Tell all cells to sync instance info."""
+        context = req.environ['nova.context']
+        authorize(context)
+        project_id = body.pop('project_id', None)
+        deleted = body.pop('deleted', False)
+        updated_since = body.pop('updated_since', None)
+        if body:
+            msg = _("Only 'updated_since' and 'project_id' are understood.")
+            raise exc.HTTPBadRequest(explanation=msg)
+        if updated_since:
+            try:
+                timeutils.parse_isotime(updated_since)
+            except ValueError:
+                msg = _('Invalid changes-since value')
+                raise exc.HTTPBadRequest(explanation=msg)
+        self.cells_rpcapi.sync_instances(context, project_id=project_id,
+                updated_since=updated_since, deleted=deleted)
+
+
+class Cells(extensions.V3APIExtensionBase):
+    """Enables cells-related functionality such as adding neighbor cells,
+    listing neighbor cells, and getting the capabilities of the local cell.
+    """
+
+    name = "Cells"
+    alias = ALIAS
+    namespace = "http://docs.openstack.org/compute/ext/cells/api/v3"
+    version = 1
+
+    def get_resources(self):
+        coll_actions = {
+                'detail': 'GET',
+                'info': 'GET',
+                'sync_instances': 'POST',
+                'capacities': 'GET',
+                }
+        memb_actions = {
+                'capacities': 'GET',
+                }
+
+        res = extensions.ResourceExtension(ALIAS, CellsController(),
+                                           collection_actions=coll_actions,
+                                           member_actions=memb_actions)
+        return [res]
+
+    def get_controller_extensions(self):
+        return []
diff --git a/nova/api/openstack/compute/plugins/v3/flavor_disabled.py b/nova/api/openstack/compute/plugins/v3/flavor_disabled.py
new file mode 100644
index 000000000..79f6df9ce
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/flavor_disabled.py
@@ -0,0 +1,91 @@
+#   Copyright 2012 Nebula, Inc.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+
+"""The Flavor Disabled API extension."""
+
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+
+ALIAS = 'os-flavor-disabled'
+authorize = extensions.soft_extension_authorizer('compute', 'v3:' + ALIAS)
+
+
+class FlavorDisabledController(wsgi.Controller):
+    def _extend_flavors(self, req, flavors):
+        for flavor in flavors:
+            db_flavor = req.get_db_flavor(flavor['id'])
+            key = "%s:disabled" % FlavorDisabled.alias
+            flavor[key] = db_flavor['disabled']
+
+    def _show(self, req, resp_obj):
+        if not authorize(req.environ['nova.context']):
+            return
+        if 'flavor' in resp_obj.obj:
+            resp_obj.attach(xml=FlavorDisabledTemplate())
+            self._extend_flavors(req, [resp_obj.obj['flavor']])
+
+    @wsgi.extends
+    def show(self, req, resp_obj, id):
+        return self._show(req, resp_obj)
+
+    @wsgi.extends(action='create')
+    def create(self, req, resp_obj, body):
+        return self._show(req, resp_obj)
+
+    @wsgi.extends
+    def detail(self, req, resp_obj):
+        if not authorize(req.environ['nova.context']):
+            return
+        resp_obj.attach(xml=FlavorsDisabledTemplate())
+        self._extend_flavors(req, list(resp_obj.obj['flavors']))
+
+
+class FlavorDisabled(extensions.V3APIExtensionBase):
+    """Support to show the disabled status of a flavor."""
+
+    name = "FlavorDisabled"
+    alias = ALIAS
+    namespace = "http://docs.openstack.org/compute/ext/%s/api/v3" % ALIAS
+    version = 1
+
+    def get_controller_extensions(self):
+        controller = FlavorDisabledController()
+        extension = extensions.ControllerExtension(self, 'flavors', controller)
+        return [extension]
+
+    def get_resources(self):
+        return []
+
+
+def make_flavor(elem):
+    elem.set('{%s}disabled' % FlavorDisabled.namespace,
+             '%s:disabled' % FlavorDisabled.alias)
+
+
+class FlavorDisabledTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('flavor', selector='flavor')
+        make_flavor(root)
+        return xmlutil.SlaveTemplate(root, 1, nsmap={
+            FlavorDisabled.alias: FlavorDisabled.namespace})
+
+
+class FlavorsDisabledTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('flavors')
+        elem = xmlutil.SubTemplateElement(root, 'flavor', selector='flavors')
+        make_flavor(elem)
+        return xmlutil.SlaveTemplate(root, 1, nsmap={
+            FlavorDisabled.alias: FlavorDisabled.namespace})
diff --git a/nova/api/openstack/compute/plugins/v3/flavors.py b/nova/api/openstack/compute/plugins/v3/flavors.py
index 733ff3750..31c0fa8b7 100644
--- a/nova/api/openstack/compute/plugins/v3/flavors.py
+++ b/nova/api/openstack/compute/plugins/v3/flavors.py
@@ -34,6 +34,8 @@ def make_flavor(elem, detailed=False):
         elem.set('ram')
         elem.set('disk')
         elem.set('vcpus', xmlutil.EmptyStringSelector('vcpus'))
+        # NOTE(vish): this was originally added without a namespace
+        elem.set('swap', xmlutil.EmptyStringSelector('swap'))
 
     xmlutil.make_links(elem, 'links')
 
diff --git a/nova/api/openstack/compute/plugins/v3/images.py b/nova/api/openstack/compute/plugins/v3/images.py
new file mode 100644
index 000000000..dde22488d
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/images.py
@@ -0,0 +1,242 @@
+# Copyright 2011 OpenStack Foundation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import webob.exc
+
+from nova.api.openstack import common
+from nova.api.openstack.compute.views import images as views_images
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+from nova import exception
+import nova.image.glance
+import nova.utils
+
+
+ALIAS = "os-images"
+authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
+
+SUPPORTED_FILTERS = {
+    'name': 'name',
+    'status': 'status',
+    'changes-since': 'changes-since',
+    'server': 'property-instance_uuid',
+    'type': 'property-image_type',
+    'minRam': 'min_ram',
+    'minDisk': 'min_disk',
+}
+
+
+def make_image(elem, detailed=False):
+    elem.set('name')
+    elem.set('id')
+
+    if detailed:
+        elem.set('updated')
+        elem.set('created')
+        elem.set('status')
+        elem.set('progress')
+        elem.set('minRam')
+        elem.set('minDisk')
+
+        server = xmlutil.SubTemplateElement(elem, 'server', selector='server')
+        server.set('id')
+        xmlutil.make_links(server, 'links')
+
+        elem.append(common.MetadataTemplate())
+
+    xmlutil.make_links(elem, 'links')
+
+
+image_nsmap = {None: xmlutil.XMLNS_V11, 'atom': xmlutil.XMLNS_ATOM}
+
+
+class ImageTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('image', selector='image')
+        make_image(root, detailed=True)
+        return xmlutil.MasterTemplate(root, 1, nsmap=image_nsmap)
+
+
+class MinimalImagesTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('images')
+        elem = xmlutil.SubTemplateElement(root, 'image', selector='images')
+        make_image(elem)
+        xmlutil.make_links(root, 'images_links')
+        return xmlutil.MasterTemplate(root, 1, nsmap=image_nsmap)
+
+
+class ImagesTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('images')
+        elem = xmlutil.SubTemplateElement(root, 'image', selector='images')
+        make_image(elem, detailed=True)
+        return xmlutil.MasterTemplate(root, 1, nsmap=image_nsmap)
+
+
+class ImagesController(wsgi.Controller):
+    """Base controller for retrieving/displaying images."""
+
+    _view_builder_class = views_images.ViewBuilder
+
+    def __init__(self, image_service=None, **kwargs):
+        """Initialize new `ImageController`.
+
+        :param image_service: `nova.image.glance:GlanceImageService`
+
+        """
+        super(ImagesController, self).__init__(**kwargs)
+        self._image_service = (image_service or
+                               nova.image.glance.get_default_image_service())
+
+    def _get_filters(self, req):
+        """
+        Return a dictionary of query param filters from the request
+
+        :param req: the Request object coming from the wsgi layer
+        :retval a dict of key/value filters
+        """
+        filters = {}
+        for param in req.params:
+            if param in SUPPORTED_FILTERS or param.startswith('property-'):
+                # map filter name or carry through if property-*
+                filter_name = SUPPORTED_FILTERS.get(param, param)
+                filters[filter_name] = req.params.get(param)
+
+        # ensure server filter is the instance uuid
+        filter_name = 'property-instance_uuid'
+        try:
+            filters[filter_name] = filters[filter_name].rsplit('/', 1)[1]
+        except (AttributeError, IndexError, KeyError):
+            pass
+
+        filter_name = 'status'
+        if filter_name in filters:
+            # The Image API expects us to use lowercase strings for status
+            filters[filter_name] = filters[filter_name].lower()
+
+        return filters
+
+    @wsgi.serializers(xml=ImageTemplate)
+    def show(self, req, id):
+        """Return detailed information about a specific image.
+
+        :param req: `wsgi.Request` object
+        :param id: Image identifier
+        """
+        context = req.environ['nova.context']
+        authorize(context)
+
+        try:
+            image = self._image_service.show(context, id)
+        except (exception.NotFound, exception.InvalidImageRef):
+            explanation = _("Image not found.")
+            raise webob.exc.HTTPNotFound(explanation=explanation)
+
+        req.cache_db_items('images', [image], 'id')
+        return self._view_builder.show(req, image)
+
+    def delete(self, req, id):
+        """Delete an image, if allowed.
+
+        :param req: `wsgi.Request` object
+        :param id: Image identifier (integer)
+        """
+        context = req.environ['nova.context']
+        authorize(context)
+
+        try:
+            self._image_service.delete(context, id)
+        except exception.ImageNotFound:
+            explanation = _("Image not found.")
+            raise webob.exc.HTTPNotFound(explanation=explanation)
+        except exception.ImageNotAuthorized:
+            # The image service raises this exception on delete if glanceclient
+            # raises HTTPForbidden.
+            explanation = _("You are not allowed to delete the image.")
+            raise webob.exc.HTTPForbidden(explanation=explanation)
+        return webob.exc.HTTPNoContent()
+
+    @wsgi.serializers(xml=MinimalImagesTemplate)
+    def index(self, req):
+        """Return an index listing of images available to the request.
+
+        :param req: `wsgi.Request` object
+
+        """
+        context = req.environ['nova.context']
+        authorize(context)
+
+        filters = self._get_filters(req)
+        params = req.GET.copy()
+        page_params = common.get_pagination_params(req)
+        for key, val in page_params.iteritems():
+            params[key] = val
+
+        try:
+            images = self._image_service.detail(context, filters=filters,
+                                                **page_params)
+        except exception.Invalid as e:
+            raise webob.exc.HTTPBadRequest(explanation=e.format_message())
+        return self._view_builder.index(req, images)
+
+    @wsgi.serializers(xml=ImagesTemplate)
+    def detail(self, req):
+        """Return a detailed index listing of images available to the request.
+
+        :param req: `wsgi.Request` object.
+
+        """
+        context = req.environ['nova.context']
+        authorize(context)
+
+        filters = self._get_filters(req)
+        params = req.GET.copy()
+        page_params = common.get_pagination_params(req)
+        for key, val in page_params.iteritems():
+            params[key] = val
+        try:
+            images = self._image_service.detail(context, filters=filters,
+                                                **page_params)
+        except exception.Invalid as e:
+            raise webob.exc.HTTPBadRequest(explanation=e.format_message())
+
+        req.cache_db_items('images', images, 'id')
+        return self._view_builder.detail(req, images)
+
+    def create(self, *args, **kwargs):
+        raise webob.exc.HTTPMethodNotAllowed()
+
+
+class Images(extensions.V3APIExtensionBase):
+    """Server addresses."""
+
+    name = "Images"
+    alias = ALIAS
+    namespace = "http://docs.openstack.org/compute/ext/images/v3"
+    version = 1
+
+    def get_resources(self):
+        collection_actions = {'detail': 'GET'}
+        resources = [
+            extensions.ResourceExtension(
+                ALIAS, ImagesController(),
+                collection_actions=collection_actions)]
+
+        return resources
+
+    def get_controller_extensions(self):
+        return []
diff --git a/nova/api/openstack/compute/plugins/v3/server_diagnostics.py b/nova/api/openstack/compute/plugins/v3/server_diagnostics.py
new file mode 100644
index 000000000..6a19732dc
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/server_diagnostics.py
@@ -0,0 +1,71 @@
+# Copyright 2011 OpenStack Foundation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import webob.exc
+
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+from nova import compute
+from nova import exception
+
+
+ALIAS = "os-server-diagnostics"
+authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
+sd_nsmap = {None: wsgi.XMLNS_V11}
+
+
+class ServerDiagnosticsTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('diagnostics')
+        elem = xmlutil.SubTemplateElement(root, xmlutil.Selector(0),
+                                          selector=xmlutil.get_items)
+        elem.text = 1
+        return xmlutil.MasterTemplate(root, 1, nsmap=sd_nsmap)
+
+
+class ServerDiagnosticsController(object):
+    @wsgi.serializers(xml=ServerDiagnosticsTemplate)
+    def index(self, req, server_id):
+        context = req.environ["nova.context"]
+        authorize(context)
+        compute_api = compute.API()
+        try:
+            instance = compute_api.get(context, server_id)
+        except exception.NotFound():
+            raise webob.exc.HTTPNotFound(_("Instance not found"))
+
+        return compute_api.get_diagnostics(context, instance)
+
+
+class ServerDiagnostics(extensions.V3APIExtensionBase):
+    """Allow Admins to view server diagnostics through server action."""
+
+    name = "ServerDiagnostics"
+    alias = ALIAS
+    namespace = ("http://docs.openstack.org/compute/ext/"
+                 "server-diagnostics/api/v3")
+    version = 1
+
+    def get_resources(self):
+        parent_def = {'member_name': 'server', 'collection_name': 'servers'}
+        resources = [
+            extensions.ResourceExtension(ALIAS,
+                                         ServerDiagnosticsController(),
+                                         parent=parent_def)]
+        return resources
+
+    def get_controller_extensions(self):
+        return []
diff --git a/nova/api/openstack/compute/schemas/v3/flavor.rng b/nova/api/openstack/compute/schemas/v3/flavor.rng
new file mode 100644
index 000000000..4b6b74001
--- /dev/null
+++ b/nova/api/openstack/compute/schemas/v3/flavor.rng
@@ -0,0 +1,12 @@
+<element name="flavor" ns="http://docs.openstack.org/compute/api/v1.1"
+    xmlns="http://relaxng.org/ns/structure/1.0">
+  <attribute name="name">      <text/> </attribute>
+  <attribute name="id">      <text/> </attribute>
+  <attribute name="ram"> <text/> </attribute>
+  <attribute name="disk">   <text/> </attribute>
+  <attribute name="vcpus">   <text/> </attribute>
+  <attribute name="swap">   <text/> </attribute>
+  <zeroOrMore>
+    <externalRef href="../atom-link.rng"/>
+  </zeroOrMore>
+</element>
diff --git a/nova/api/openstack/compute/schemas/v3/flavors.rng b/nova/api/openstack/compute/schemas/v3/flavors.rng
new file mode 100644
index 000000000..b7a3acc01
--- /dev/null
+++ b/nova/api/openstack/compute/schemas/v3/flavors.rng
@@ -0,0 +1,6 @@
+<element name="flavors" xmlns="http://relaxng.org/ns/structure/1.0"
+         ns="http://docs.openstack.org/compute/api/v1.1">
+  <zeroOrMore>
+    <externalRef href="flavor.rng"/>
+  </zeroOrMore>
+</element>
diff --git a/nova/api/openstack/xmlutil.py b/nova/api/openstack/xmlutil.py
index 04f5e28e3..37766b3e3 100644
--- a/nova/api/openstack/xmlutil.py
+++ b/nova/api/openstack/xmlutil.py
@@ -33,12 +33,12 @@ XMLNS_COMMON_V10 = 'http://docs.openstack.org/common/api/v1.0'
 XMLNS_ATOM = 'http://www.w3.org/2005/Atom'
 
 
-def validate_schema(xml, schema_name):
+def validate_schema(xml, schema_name, version='v1.1'):
     if isinstance(xml, str):
         xml = etree.fromstring(xml)
-    base_path = 'nova/api/openstack/compute/schemas/v1.1/'
-    if schema_name in ('atom', 'atom-link'):
-        base_path = 'nova/api/openstack/compute/schemas/'
+    base_path = 'nova/api/openstack/compute/schemas/'
+    if schema_name not in ('atom', 'atom-link'):
+        base_path += '%s/' % version
     schema_path = os.path.join(utils.novadir(),
                                '%s%s.rng' % (base_path, schema_name))
     schema_doc = etree.parse(schema_path)
diff --git a/nova/availability_zones.py b/nova/availability_zones.py
index 6d111c120..216c46041 100644
--- a/nova/availability_zones.py
+++ b/nova/availability_zones.py
@@ -23,7 +23,7 @@ from nova.openstack.common import memorycache
 # NOTE(vish): azs don't change that often, so cache them for an hour to
 #             avoid hitting the db multiple times on every request.
 AZ_CACHE_SECONDS = 60 * 60
-MC = memorycache.get_client()
+MC = None
 
 availability_zone_opts = [
     cfg.StrOpt('internal_service_availability_zone',
@@ -38,6 +38,27 @@ CONF = cfg.CONF
 CONF.register_opts(availability_zone_opts)
 
 
+def _get_cache():
+    global MC
+
+    if MC is None:
+        MC = memorycache.get_client()
+
+    return MC
+
+
+def _reset_cache():
+    """Reset the cache, mainly for testing purposes."""
+
+    global MC
+
+    MC = None
+
+
+def _make_cache_key(host):
+    return "azcache-%s" % host
+
+
 def set_availability_zones(context, services):
     # Makes sure services isn't a sqlalchemy object
     services = [dict(service.iteritems()) for service in services]
@@ -50,6 +71,11 @@ def set_availability_zones(context, services):
                 az = u','.join(list(metadata[service['host']]))
             else:
                 az = CONF.default_availability_zone
+                # update the cache
+                cache = _get_cache()
+                cache_key = _make_cache_key(service['host'])
+                cache.delete(cache_key)
+                cache.set(cache_key, az, AZ_CACHE_SECONDS)
         service['availability_zone'] = az
     return services
 
@@ -62,9 +88,10 @@ def get_host_availability_zone(context, host, conductor_api=None):
         metadata = db.aggregate_metadata_get_by_host(
             context, host, key='availability_zone')
     if 'availability_zone' in metadata:
-        return list(metadata['availability_zone'])[0]
+        az = list(metadata['availability_zone'])[0]
     else:
-        return CONF.default_availability_zone
+        az = CONF.default_availability_zone
+    return az
 
 
 def get_availability_zones(context):
@@ -95,10 +122,11 @@ def get_instance_availability_zone(context, instance):
     if not host:
         return None
 
-    cache_key = "azcache-%s" % host
-    az = MC.get(cache_key)
+    cache_key = _make_cache_key(host)
+    cache = _get_cache()
+    az = cache.get(cache_key)
     if not az:
         elevated = context.elevated()
         az = get_host_availability_zone(elevated, host)
-        MC.set(cache_key, az, AZ_CACHE_SECONDS)
+        cache.set(cache_key, az, AZ_CACHE_SECONDS)
     return az
diff --git a/nova/cells/scheduler.py b/nova/cells/scheduler.py
index 08f485189..c2b3ff2b7 100644
--- a/nova/cells/scheduler.py
+++ b/nova/cells/scheduler.py
@@ -24,6 +24,7 @@ from oslo.config import cfg
 from nova.cells import filters
 from nova.cells import weights
 from nova import compute
+from nova.compute import flavors
 from nova.compute import instance_actions
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
@@ -80,6 +81,10 @@ class CellsScheduler(base.Base):
     def _create_instances_here(self, ctxt, instance_uuids, instance_properties,
             instance_type, image, security_groups, block_device_mapping):
         instance_values = copy.copy(instance_properties)
+        sys_metadata = flavors.save_flavor_info(dict(), instance_type)
+        instance_values['system_metadata'] = sys_metadata
+        instance_values.pop('name')
+
         num_instances = len(instance_uuids)
         for i, instance_uuid in enumerate(instance_uuids):
             instance_values['uuid'] = instance_uuid
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 0c6d4f640..dbef94596 100755
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -106,6 +106,9 @@ compute_opts = [
                 default=False,
                 help='Whether to start guests that were running before the '
                      'host rebooted'),
+    cfg.IntOpt('network_allocate_retries',
+               default=0,
+               help="Number of times to retry network allocation on failures"),
     ]
 
 interval_opts = [
@@ -409,7 +412,8 @@ class ComputeManager(manager.SchedulerDependentManager):
                         'trying to set it to ERROR'),
                       instance_uuid=instance_uuid)
 
-    def _get_instances_on_driver(self, context, filters=None):
+    def _get_instances_on_driver(self, context, filters=None,
+                                 columns_to_join=None):
         """Return a list of instance records for the instances found
         on the hypervisor which satisfy the specified filters. If filters=None
         return a list of instance records for all the instances found on the
@@ -421,7 +425,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             driver_uuids = self.driver.list_instance_uuids()
             filters['uuid'] = driver_uuids
             local_instances = self.conductor_api.instance_get_all_by_filters(
-                    context, filters, columns_to_join=[])
+                    context, filters, columns_to_join=columns_to_join)
             return local_instances
         except NotImplementedError:
             pass
@@ -430,7 +434,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         # to brute force.
         driver_instances = self.driver.list_instances()
         instances = self.conductor_api.instance_get_all_by_filters(
-            context, filters, columns_to_join=[])
+            context, filters, columns_to_join=columns_to_join)
         name_map = dict((instance['name'], instance) for instance in instances)
         local_instances = []
         for driver_instance in driver_instances:
@@ -1151,6 +1155,50 @@ class ComputeManager(manager.SchedulerDependentManager):
                               expected_task_state=(task_states.SCHEDULING,
                                                    None))
 
+    def _allocate_network_async(self, context, instance, requested_networks,
+                                macs, security_groups, is_vpn):
+        """Method used to allocate networks in the background.
+
+        Broken out for testing.
+        """
+        LOG.debug(_("Allocating IP information in the background."),
+                  instance=instance)
+        retries = CONF.network_allocate_retries
+        if retries < 0:
+            LOG.warn(_("Treating negative config value (%(retries)s) for "
+                       "'network_allocate_retries' as 0."),
+                     {'retries': retries})
+        attempts = retries > 1 and retries + 1 or 1
+        retry_time = 1
+        for attempt in range(1, attempts + 1):
+            try:
+                nwinfo = self.network_api.allocate_for_instance(
+                        context, instance, vpn=is_vpn,
+                        requested_networks=requested_networks,
+                        macs=macs,
+                        conductor_api=self.conductor_api,
+                        security_groups=security_groups)
+                LOG.debug(_('Instance network_info: |%s|'), nwinfo,
+                          instance=instance)
+                return nwinfo
+            except Exception:
+                exc_info = sys.exc_info()
+                log_info = {'attempt': attempt,
+                            'attempts': attempts}
+                if attempt == attempts:
+                    LOG.exception(_('Instance failed network setup '
+                                    'after %(attempts)d attempt(s)'),
+                                  log_info)
+                    raise exc_info[0], exc_info[1], exc_info[2]
+                LOG.warn(_('Instance failed network setup '
+                           '(attempt %(attempt)d of %(attempts)d)'),
+                         log_info, instance=instance)
+                time.sleep(retry_time)
+                retry_time *= 2
+                if retry_time > 30:
+                    retry_time = 30
+        # Not reached.
+
     def _allocate_network(self, context, instance, requested_networks, macs,
                           security_groups):
         """Start network allocation asynchronously.  Return an instance
@@ -1165,25 +1213,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                                          task_state=task_states.NETWORKING,
                                          expected_task_state=None)
         is_vpn = pipelib.is_vpn_image(instance['image_ref'])
-
-        def async_alloc():
-            LOG.debug(_("Allocating IP information in the background."),
-                      instance=instance)
-            try:
-                nwinfo = self.network_api.allocate_for_instance(
-                        context, instance, vpn=is_vpn,
-                        requested_networks=requested_networks,
-                        macs=macs,
-                        conductor_api=self.conductor_api,
-                        security_groups=security_groups)
-            except Exception:
-                with excutils.save_and_reraise_exception():
-                    LOG.exception(_('Instance failed network setup'),
-                                  instance=instance)
-            LOG.debug(_('Instance network_info: |%s|'), nwinfo,
-                      instance=instance)
-            return nwinfo
-        return network_model.NetworkInfoAsyncWrapper(async_alloc)
+        return network_model.NetworkInfoAsyncWrapper(
+                self._allocate_network_async, context, instance,
+                requested_networks, macs, security_groups, is_vpn)
 
     def _prep_block_device(self, context, instance, bdms):
         """Set up the block device for an instance with error logging."""
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 9e0f8f7e0..72c9fcefe 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -555,8 +555,7 @@ def compute_node_update(context, compute_id, values, prune_stats=False):
         # Always update this, even if there's going to be no other
         # changes in data.  This ensures that we invalidate the
         # scheduler cache of compute node data in case of races.
-        if 'updated_at' not in values:
-            values['updated_at'] = timeutils.utcnow()
+        values['updated_at'] = timeutils.utcnow()
         convert_datetimes(values, 'created_at', 'deleted_at', 'updated_at')
         compute_ref.update(values)
     return compute_ref
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 183a42f60..d1be47f8c 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -760,11 +760,15 @@ class FloatingIp(BASE, NovaBase):
 class DNSDomain(BASE, NovaBase):
     """Represents a DNS domain with availability zone or project info."""
     __tablename__ = 'dns_domains'
+    __table_args__ = (
+        Index('project_id', 'project_id'),
+        Index('dns_domains_domain_deleted_idx', 'domain', 'deleted'),
+    )
     deleted = Column(Boolean, default=False)
-    domain = Column(String(512), primary_key=True)
-    scope = Column(String(255))
-    availability_zone = Column(String(255))
-    project_id = Column(String(255))
+    domain = Column(String(255), primary_key=True)
+    scope = Column(String(255), nullable=True)
+    availability_zone = Column(String(255), nullable=True)
+    project_id = Column(String(255), nullable=True)
 
 
 class ConsolePool(BASE, NovaBase):
@@ -899,6 +903,9 @@ class AggregateHost(BASE, NovaBase):
 class AggregateMetadata(BASE, NovaBase):
     """Represents a metadata key/value pair for an aggregate."""
     __tablename__ = 'aggregate_metadata'
+    __table_args__ = (
+        Index('aggregate_metadata_key_idx', 'key'),
+    )
     id = Column(Integer, primary_key=True)
     key = Column(String(255), nullable=False)
     value = Column(String(255), nullable=False)
@@ -955,15 +962,19 @@ class AgentBuild(BASE, NovaBase):
 class BandwidthUsage(BASE, NovaBase):
     """Cache for instance bandwidth usage data pulled from the hypervisor."""
     __tablename__ = 'bw_usage_cache'
+    __table_args__ = (
+        Index('bw_usage_cache_uuid_start_period_idx', 'uuid',
+              'start_period'),
+    )
     id = Column(Integer, primary_key=True, nullable=False)
-    uuid = Column(String(36), nullable=False)
-    mac = Column(String(255), nullable=False)
+    uuid = Column(String(36), nullable=True)
+    mac = Column(String(255), nullable=True)
     start_period = Column(DateTime, nullable=False)
-    last_refreshed = Column(DateTime)
-    bw_in = Column(BigInteger)
-    bw_out = Column(BigInteger)
-    last_ctr_in = Column(BigInteger)
-    last_ctr_out = Column(BigInteger)
+    last_refreshed = Column(DateTime, nullable=True)
+    bw_in = Column(BigInteger, nullable=True)
+    bw_out = Column(BigInteger, nullable=True)
+    last_ctr_in = Column(BigInteger, nullable=True)
+    last_ctr_out = Column(BigInteger, nullable=True)
 
 
 class VolumeUsage(BASE, NovaBase):
diff --git a/nova/db/sqlalchemy/utils.py b/nova/db/sqlalchemy/utils.py
index 6c0a53846..918f50bfd 100644
--- a/nova/db/sqlalchemy/utils.py
+++ b/nova/db/sqlalchemy/utils.py
@@ -17,7 +17,7 @@
 
 import re
 
-from migrate.changeset import UniqueConstraint
+from migrate.changeset import UniqueConstraint, ForeignKeyConstraint
 from sqlalchemy import Boolean
 from sqlalchemy import CheckConstraint
 from sqlalchemy import Column
@@ -101,7 +101,8 @@ def _get_unique_constraints_in_sqlite(migrate_engine, table_name):
 
     uniques = set([
         schema.UniqueConstraint(
-            *[getattr(table.c, c.strip()) for c in cols.split(",")], name=name
+            *[getattr(table.c, c.strip(' "'))
+              for c in cols.split(",")], name=name
         )
         for name, cols in re.findall(regexp, sql_data)
     ])
@@ -128,7 +129,8 @@ def _drop_unique_constraint_in_sqlite(migrate_engine, table_name, uc_name,
     table.constraints.update(uniques)
 
     constraints = [constraint for constraint in table.constraints
-                    if not constraint.name == uc_name]
+                    if not constraint.name == uc_name and
+                    not isinstance(constraint, schema.ForeignKeyConstraint)]
 
     new_table = Table(table_name + "__tmp__", meta, *(columns + constraints))
     new_table.create()
@@ -139,12 +141,20 @@ def _drop_unique_constraint_in_sqlite(migrate_engine, table_name, uc_name,
         indexes.append(Index(index["name"],
                              *column_names,
                              unique=index["unique"]))
+    f_keys = []
+    for fk in insp.get_foreign_keys(table_name):
+        refcolumns = [fk['referred_table'] + '.' + col
+                      for col in fk['referred_columns']]
+        f_keys.append(ForeignKeyConstraint(fk['constrained_columns'],
+                      refcolumns, table=new_table, name=fk['name']))
 
     ins = InsertFromSelect(new_table, table.select())
     migrate_engine.execute(ins)
     table.drop()
 
     [index.create(migrate_engine) for index in indexes]
+    for fkey in f_keys:
+        fkey.create()
     new_table.rename(table_name)
 
 
diff --git a/nova/locale/bg_BG/LC_MESSAGES/nova.po b/nova/locale/bg_BG/LC_MESSAGES/nova.po
index 90088a405..2409d93c2 100644
--- a/nova/locale/bg_BG/LC_MESSAGES/nova.po
+++ b/nova/locale/bg_BG/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-18 19:07+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index c11acc613..f37d58f63 100644
--- a/nova/locale/bs/LC_MESSAGES/nova.po
+++ b/nova/locale/bs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-01-19 20:22+0000\n"
 "Last-Translator: yazar  <zrncescientiae@gmail.com>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -662,8 +662,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -971,7 +972,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1195,180 +1196,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1456,67 +1462,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1879,11 +1900,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2347,17 +2363,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2365,6 +2384,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2389,6 +2410,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2402,14 +2424,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2443,9 +2465,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2579,111 +2601,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2692,22 +2718,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2789,6 +2815,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3016,14 +3043,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3484,97 +3515,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3665,6 +3709,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3680,6 +3758,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4072,205 +4165,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4360,657 +4453,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5130,12 +5243,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5258,34 +5371,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5295,7 +5408,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5637,42 +5750,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5833,7 +5946,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6707,7 +6820,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6818,11 +6931,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6833,6 +6941,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6872,10 +6985,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6923,13 +7049,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7114,61 +7245,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7288,7 +7419,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8118,7 +8249,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8470,12 +8601,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8808,100 +8939,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8909,76 +9040,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8986,50 +9132,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9039,67 +9185,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9319,47 +9470,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9367,7 +9519,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9375,7 +9527,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9383,7 +9535,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10745,228 +10897,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10974,58 +11126,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11372,3 +11524,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ca/LC_MESSAGES/nova.po b/nova/locale/ca/LC_MESSAGES/nova.po
index 24239e63a..94aa352aa 100644
--- a/nova/locale/ca/LC_MESSAGES/nova.po
+++ b/nova/locale/ca/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index cdb8d1836..384ed9449 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-05-17 20:04+0000\n"
 "Last-Translator: Zbyněk Schwarz <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -199,7 +199,7 @@ msgstr "Obdržen neplatný vstup"
 msgid "Invalid volume"
 msgstr "Neplatný svazek"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -686,8 +686,9 @@ msgstr "Existuje nula plovoucích ip."
 msgid "Interface %(interface)s not found."
 msgstr "Rozhraní %(interface)s nenalezeno."
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -1008,7 +1009,7 @@ msgstr "Instance typu %(name)s již existuje."
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1238,181 +1239,186 @@ msgstr "Instance %(instance_id)s nenalezena"
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "Dvojice klí�ů %(name)s nenalezena pro uživatele %(user_id)s"
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password není tímto ovlada�em zavedeno"
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "O�ekáván objekt typu: %s"
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1501,67 +1507,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "ladění ve zpětném volání: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Adresa místního spojení nenalezena.: %s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Nelze získat IP místního spojení %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Neplatná podpůrná vrstva: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "O�ekáván objekt typu: %s"
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Nelze odstranit kontejner: %s"
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Název serveru není řetězec nebo unicode"
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "Dvojice klí�ů musí být dlouhá 1 až 255 znaků."
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1939,11 +1960,6 @@ msgstr "Oddělit adresu %s"
 msgid "Floating ip is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Obraz musí být dostupný"
@@ -2416,17 +2432,20 @@ msgstr "podtřídy musí zavádět construct()!"
 msgid "Initializing extension manager."
 msgstr "Zavádění správce rozšíření."
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Neplatný podpis pro uživatele %s"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Neplatný podpis pro uživatele %s"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2434,6 +2453,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr "Obraz nenalezen"
 
@@ -2458,6 +2479,7 @@ msgid "Invalid metadata key"
 msgstr "Neplatný klí� metadata"
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2471,7 +2493,7 @@ msgstr "Instance neexistuje"
 msgid "Instance is not a member of specified network"
 msgstr "Instance není �lenem zadané sítě"
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
@@ -2480,7 +2502,7 @@ msgstr ""
 "Pouze %(value)s požadavky %(verb)s mohou být provedeny pro %(uri)s "
 "každých %(unit_string)s."
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr "Tento požadavek má omezen množství."
 
@@ -2515,9 +2537,9 @@ msgstr "Hostitel %(host)s nemohl být nalezen."
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2655,118 +2677,122 @@ msgstr "Nelze najít požadovaný obraz"
 msgid "Invalid key_name provided."
 msgstr "Zadán neplatný název_klí�e."
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "id nemůže být None"
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "id nemůže být None"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr "Instanci nebyla změněna velikost."
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Argument 'type' pro restart není HARD �i SOFT"
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr "Chybí argument 'type' pro restart"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr "Nelze najít požadovanou konfiguraci."
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Resize vyžaduje změnu velikosti."
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "%s je platný název instance"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "Chybí vlastnost imageRef"
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr "Zadáno neplatné imageRef."
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "Chybí vlastnost flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr "Nebylo zadáno adminPass"
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr "Neplatné adminPass"
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Nelze zpracovat metadata dvojic hodnot/klí�ů."
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti má neplatnou vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2775,22 +2801,22 @@ msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 msgid "Invalid request body"
 msgstr "Neplatné tělo požadavku"
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr "Nelze zpracovat imageRef z požadavku."
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr "Nelze najít obraz ke znovu sestavení"
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr "Objekt createImage cyžaduje vlastnost name"
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
@@ -2873,6 +2899,7 @@ msgstr "Vlastnost createBackup 'rotation' musí být celé �íslo"
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr "Instance nenalezena"
 
@@ -3113,15 +3140,19 @@ msgstr "Certifikát %(certificate_id)s nenalezen."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 #, fuzzy
 msgid "Flavor not found."
 msgstr "Server nenalezen."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 #, fuzzy
 msgid "No request body"
 msgstr "Žádné tělo požadavku"
@@ -3601,98 +3632,111 @@ msgstr "Volání továrny rozšíření %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "pro zprávu není metoda: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "Nelze na�ít rozšížení %(ext_factory)s: %(exc)s"
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "pro zprávu není metoda: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, fuzzy, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, fuzzy, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr "Obsazena '%(method)s' do '%(host)s' výpo�tu"
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3783,6 +3827,40 @@ msgstr "Spouštění VPN pro %s"
 msgid "Failed to load %s"
 msgstr "Nelze vytvořit svazek"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3798,6 +3876,21 @@ msgstr "prvek není podřazený"
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4213,81 +4306,81 @@ msgstr "Bezpe�nostní skupina %s by neměla být větší než 255 znaků."
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Nelze připojit svazek k instanci %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Chystá se spuštění %s instancí..."
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "BUde spuštěno ukon�ování insatncí"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance typu %(instance_type_id)s nemohla být nalezena."
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "BUde spuštěno ukon�ování insatncí"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "Žádný hostitel pro instnaci %s, okamžitě smazána"
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukon�ení %s"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr "Hledání podle: %s"
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id je None. Předpokládán přesun."
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4296,63 +4389,63 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "Překro�ena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Pokus o ukon�ení %s"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Dvojice klí�ů musí být dlouhá 1 až 255 znaků."
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "Bezpe�nostní skupina %s není řetězec nebo unicode"
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Bezpe�nostní skupina %s nemůže být prázdná."
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4361,70 +4454,70 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překra�uje maximum "
 "255 znaků."
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "Bezpe�nostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Vytvořit bezpe�nostní skupinu %s"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Bezpe�nostní skupina %s již existuje"
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Nelze zni�it vbd %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nelze zni�it vbd %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Id bezpe�nostní skupiny by mělo být celé �íslo"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Pravidlo (%s) nenalezeno"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Přidávání pravidla bezpe�nostní skupiny: %r"
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Povolit přístup bezpe�nostní skupiny %s"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Zrušit přístup bezpe�nostní skupiny %s"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr "Id bezpe�nostní skupiny by mělo být celé �íslo"
 
@@ -4516,20 +4609,20 @@ msgstr "Chyba DB: %s"
 msgid "Instance type %s not found for deletion"
 msgstr "Instance typu %s není nalezena ke smazání"
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4538,241 +4631,261 @@ msgstr ""
 "Nelze přesunout instanci (%(instance_id)s) na sou�asného hostitele "
 "(%(host)s)."
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Nelze restartovat instanci"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Sou�asný stav je %(drv_state)s, stav v DB je %(db_state)s."
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Restartování instance po restartu nova-compute."
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Ovlada� hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Ovlada� hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Neo�ekávaný kód stavu"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr "Kontrola stavu"
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Nastavování bdm %s"
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr "Spouštění instance..."
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
-msgstr "Instance selhala v nastavení sítě"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
+msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr "Instance selhala nastavení blokového zařízení"
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s nstance"
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "ukon�ování bdm %s"
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Nastavování stavu vm instance na ERROR"
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Znovu sestavování instance %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Vytvořit snímek ze svazku %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Restartování instance %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4781,26 +4894,26 @@ msgstr ""
 "pokus o restartování nespuštěné instance: %(instance_uuid)s (stav: "
 "%(state)s o�ekáváno: %(running)s)"
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: znovu zavedena"
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4809,231 +4922,231 @@ msgstr ""
 "pokus o vytvoření snímku z nespuštěné instance: %(instance_uuid)s (stav: "
 "%(state)s o�ekáváno: %(running)s)"
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Nalezeno %(num_images)d obrazů (střídání: %(rotation)d)"
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Střídání %d záloh"
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Mazání obrazu %s"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 #, fuzzy
 msgid "Root password set"
 msgstr "Instance %s: Nastavení hesla root"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "set_admin_password není tímto ovlada�em zavedeno"
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password není tímto ovlada�em zavedeno"
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Chyba při nastavování hesla správce"
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: rušení záchrany"
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance nemá svazek."
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "cíl stejný jako zdroj!"
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 #, fuzzy
 msgid "Pausing"
 msgstr "Aktualizování!"
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: získávání diagnostik"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "Reset sítě"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "instance %s: vkládání informací o síti"
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info vkládá: |%s|"
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, fuzzy, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "Odpojování svazku %(volume_id)s z bodu připojení %(mp)s"
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Odpojování svazku z neznámé instance %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "zahájen přesun po spuštění."
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -5041,21 +5154,21 @@ msgstr ""
 "Můžete vidět tuto chybu \"libvirt: QEMU error: Domain not found: no "
 "domain with matching name.\" Tuto chybu můžete bezpe�ně ignorovat."
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Spuštěna operace po migraci"
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Nelze získat metadata pro ip: %s"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -5064,64 +5177,64 @@ msgstr ""
 "Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
 "%(confirm_window)d vteřin"
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "Vypínání VM pro instanci %(instance_uuid)s"
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "Aktualizace stavu hostitele"
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5130,86 +5243,86 @@ msgstr ""
 "Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
 "hypervizoru."
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance není zapnuta"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr "Znovu získávání smazané instance"
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Zaznamování ovlada�e svazku: %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "Žádná služba pro ID výpo�tu %s"
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
@@ -5331,12 +5444,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
@@ -5466,34 +5579,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Nerozpoznaná hodnota read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: zachráněna"
@@ -5503,7 +5616,7 @@ msgstr "instance %s: zachráněna"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5853,42 +5966,42 @@ msgstr "ukon�ení radvd vrhlo %s"
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d je starý, znovu spouštění radvd"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Neplatný stav: '%s'"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Spouštění rozhraní VLAN %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Zajišťování mostu %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Zajišťování vlan %(vlan)s a mostu %(bridge)s"
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Zajišťování mostu %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Zajišťování mostu %s"
@@ -6062,7 +6175,7 @@ msgstr "_smazat: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "podsítě v4 jsou vyžadovány pro zastaralé nw_info"
 
@@ -6963,7 +7076,7 @@ msgstr "Nelze najít další výpo�et"
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -7076,11 +7189,6 @@ msgstr "Žádná služba pro ID výpo�tu %s"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr "Nelze naplánovat_%(method)s: %(ex)s"
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -7091,6 +7199,11 @@ msgstr "Nelze vyhodnotit soubor voleb plánova�e %(filename)s: '%(e)s'"
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -7130,10 +7243,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "VCPU nenastaveny; předpokládáno poškození sbírky CPU"
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7181,13 +7307,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7373,7 +7504,7 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 #, fuzzy
 msgid ""
@@ -7381,55 +7512,55 @@ msgid ""
 "instances"
 msgstr "Překro�ena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "Spouštění instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Po ukon�ení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Po vynuceném ukon�ení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7555,7 +7686,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8398,7 +8529,7 @@ msgstr "Verze agenta instance: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Aktualizace statistik hostitele"
@@ -8764,12 +8895,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Přidělení plovoucí IP pro |%s|"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Vkládání cesty souboru: '%s'"
@@ -9120,102 +9251,102 @@ msgstr "Instance úspěšně restartována."
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr "Instance je spuštěna"
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "Ignorování chyby při vkládání dat do obrazu %(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9223,19 +9354,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9244,33 +9375,48 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9279,25 +9425,25 @@ msgstr ""
 "Nelze získat po�et cpu, protože tato funkce není na této platformě "
 "zavedena. Tuto chybu lze prozatím bezpe�ně ignorovat."
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "verze libvirt je příliš stará (nepodporuje getVersion)"
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Získávání velikosto brazu %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9305,21 +9451,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9328,16 +9474,16 @@ msgstr ""
 "Vytváření do�asného souboru %s pro informování ostatních po�íta�ových "
 "uzlů, že by se měli připojit ke stejnému úložišti."
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr "Přesunutí bloku nemůže být použito ve sdíleném úložišti."
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "Přesunutí bloku nemůže být použito ve sdíleném úložišti."
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9346,7 +9492,7 @@ msgstr ""
 "Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek disku  "
 "(hostitel:%(available)s <= instance:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9355,7 +9501,7 @@ msgstr ""
 "Spuštěná instance má info o CPU:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9370,7 +9516,7 @@ msgstr ""
 "\n"
 "Prohlédněte si %(u)s"
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9379,24 +9525,24 @@ msgstr ""
 "Vytváření do�asného souboru %s pro informování ostatních po�íta�ových "
 "uzlů, že by se měli připojit ke stejnému úložišti."
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 "plug_vifs() selhalo %(cnt)d.opakování až na %(max_retry)d pro "
 "%(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9405,42 +9551,47 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Instance %s: Spouštění přesunu disku a vypnutí"
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Instance %s úspěšně běží."
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "Instance %s: Spouštění dokon�ení přesunu"
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "Instance %s: Spuštění doko�ení vrácení přesunu"
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9670,48 +9821,49 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Neo�ekávaná chyba: %s"
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "Zajišťování vlan %(vlan)s a mostu %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "Zajišťování mostu %s"
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 #, fuzzy
 msgid "Failed while unplugging vif"
 msgstr "Nelze při odpojení vif instance '%s'"
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9719,7 +9871,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9727,7 +9879,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9735,7 +9887,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -11195,29 +11347,29 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 "Velkost %(size_bytes) obrazu překra�uje povolenou velikost "
 "%(allowed_size_bytes)d typu instance"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Velikost obrazu %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -11226,64 +11378,64 @@ msgstr ""
 "Obraz Kernel/Ramdisk je příliš velký: %(vdi_size)d bajtů, max "
 "%(max_size)d bajtů"
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Kopírování VDI %s do /boot/guest na dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s zni�eno"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "instance %s: nelze získat obraz glance"
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Zjištěn formát %(image_type_str)s obrazu %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Hledání vdi %s pro kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s je stále dostupné"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Znovu skenování SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "Příznak sr_matching_filter '%s' se neřídí pravidly formátování"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
@@ -11292,50 +11444,50 @@ msgstr ""
 "XenAPI nelze najít úložiště na které nainstalovat instance hostů. Prosím "
 "zkontrolujte Vaše nastavení a/nebo nastavte příznak 'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr "Nelze najít SR typu obsahu ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr "ISO: není obsah iso"
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO: typ obsahu iso, není klí� 'i18n-key'"
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO: typ obsahu iso, hodnota i18n-key není 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR odpovídající naším kritériím"
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, prozkoumáváno, zdali se jedná o místního hostitele"
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: shoda PBD, požadováno %(pbd_rec)s, získáno %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR s místním PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -11344,22 +11496,22 @@ msgstr ""
 "Nelze získat RRD XML pro VM %(vm_uuid)s mající podrobnosti serveru: "
 "%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "Neznámá data statistik od Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s má nadřazenho %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -11368,66 +11520,66 @@ msgstr ""
 "Nadřazený %(parent_uuid)s se neshoduje s původním nadřazeným "
 "%(original_parent_uuid)s, �ekání na splynutí..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Vypršel �asový limit při �ekání na vytvoření zařízení %s"
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Zapojování VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Zapojování VBD %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s zapojeno jako %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s zapojeno do špatného dev, znovu mapování do %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ni�ení VBD pro VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ni�ení VBD pro VDI %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Spouštění pygrub s %s"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Nalezen kernel Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Žádný kernel Xen nenalezen. Zavádění HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11435,16 +11587,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr "Oddíly:"
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sektorů"
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -11453,42 +11605,42 @@ msgstr ""
 "Zapisování tabulky oddílů %(primary_first)d %(primary_last)d do "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Zapisování tabulky oddílů %s dokon�eno."
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr "Přímé zacházení se soubory rozhraní"
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "Nelze připojit souborový systém (o�ekáváno v nelinuxových instancích): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11861,3 +12013,18 @@ msgstr "stav musí být dostupný"
 msgid "status must be 'available'"
 msgstr "stav musí být dostupný"
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr "Instance selhala v nastavení sítě"
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr "Nelze naplánovat_%(method)s: %(ex)s"
+
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 77fa877a0..84d378fe1 100644
--- a/nova/locale/da/LC_MESSAGES/nova.po
+++ b/nova/locale/da/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2011-01-15 21:46+0000\n"
 "Last-Translator: Soren Hansen <soren@linux2go.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -662,8 +662,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -971,7 +972,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1195,180 +1196,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1456,67 +1462,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1879,11 +1900,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2347,17 +2363,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2365,6 +2384,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2389,6 +2410,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2402,14 +2424,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2443,9 +2465,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2579,111 +2601,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2692,22 +2718,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2789,6 +2815,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3016,14 +3043,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3484,97 +3515,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3665,6 +3709,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3680,6 +3758,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4072,205 +4165,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4360,657 +4453,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5130,12 +5243,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5258,34 +5371,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5295,7 +5408,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5637,42 +5750,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5833,7 +5946,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6707,7 +6820,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6818,11 +6931,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6833,6 +6941,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6872,10 +6985,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6923,13 +7049,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7114,61 +7245,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7288,7 +7419,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8118,7 +8249,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8470,12 +8601,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr "bind %s: slettet"
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 94e00569b..b8105b310 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2011-08-23 11:23+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2349,17 +2365,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2367,6 +2386,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2391,6 +2412,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2404,14 +2426,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2445,9 +2467,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2581,112 +2603,116 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Instanz %s: Rettung"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2695,22 +2721,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2792,6 +2818,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3021,14 +3048,18 @@ msgstr "Instanz %s pausiert"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3490,98 +3521,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3672,6 +3716,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Nicht möglich volume %s zufinden"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3687,6 +3765,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4080,206 +4173,206 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4369,664 +4462,684 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Volume %s: erstelle Export"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5146,12 +5259,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5274,34 +5387,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5311,7 +5424,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5653,42 +5766,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5849,7 +5962,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6725,7 +6838,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6836,11 +6949,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6851,6 +6959,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6890,10 +7003,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6941,13 +7067,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7132,61 +7263,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7306,7 +7437,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8141,7 +8272,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8493,12 +8624,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8834,100 +8965,100 @@ msgstr "Volume %s: erfolgreich erstellt"
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8935,76 +9066,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9012,50 +9158,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9065,67 +9211,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9345,47 +9496,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9393,7 +9545,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9401,7 +9553,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9409,7 +9561,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10774,228 +10926,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11003,58 +11155,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11403,3 +11555,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index 28187622e..7da611e67 100644
--- a/nova/locale/en_AU/LC_MESSAGES/nova.po
+++ b/nova/locale/en_AU/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2011-10-21 11:27+0000\n"
 "Last-Translator: Tom Fifield <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -668,8 +668,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -977,7 +978,7 @@ msgstr "group %s already exists"
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1201,180 +1202,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Going to try to terminate %s"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Going to try to terminate %s"
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1463,67 +1469,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1892,11 +1913,6 @@ msgstr "Disassociate address %s"
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2361,17 +2377,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Invalid signature for user %s"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Invalid signature for user %s"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2379,6 +2398,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2403,6 +2424,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2416,14 +2438,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2458,9 +2480,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2594,116 +2616,120 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Mountpoint cannot be translated: %s"
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Mountpoint cannot be translated: %s"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "instance %s: booted"
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "instance %s: rescued"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Going to start terminating instances"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2712,22 +2738,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2809,6 +2835,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3042,14 +3069,18 @@ msgstr "setting network host"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3518,98 +3549,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "no method for message: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "no method for message: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Going to start terminating instances"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Going to start terminating instances"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3700,6 +3744,40 @@ msgstr "Launching VPN for %s"
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3715,6 +3793,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4116,213 +4209,213 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "instance %s: booted"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorise security group ingress %s"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4413,678 +4506,698 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected error raised: %s"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "setting network host"
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5204,12 +5317,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5333,34 +5446,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
@@ -5370,7 +5483,7 @@ msgstr "instance %s: rescued"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5713,42 +5826,42 @@ msgstr "killing radvd threw %s"
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid backend: %s"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Error starting xvp: %s"
@@ -5912,7 +6025,7 @@ msgstr "received %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6795,7 +6908,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6906,11 +7019,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6921,6 +7029,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6960,10 +7073,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7011,13 +7137,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7202,61 +7333,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7377,7 +7508,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8218,7 +8349,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8574,12 +8705,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Going to start terminating instances"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Injecting file path: '%s'"
@@ -8922,102 +9053,102 @@ msgstr "instance %s: rebooted"
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9025,76 +9156,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9102,50 +9248,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9155,67 +9301,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9435,47 +9586,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9483,7 +9635,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9491,7 +9643,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9499,7 +9651,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10880,162 +11032,162 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -11044,66 +11196,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11111,58 +11263,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11517,3 +11669,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 922f9558f..d2c13c055 100644
--- a/nova/locale/en_GB/LC_MESSAGES/nova.po
+++ b/nova/locale/en_GB/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-03-30 11:10+0000\n"
 "Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -193,7 +193,7 @@ msgstr "Invalid input received"
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -668,8 +668,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -977,7 +978,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1201,180 +1202,185 @@ msgstr "Instance %(instance_id)s is not running."
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1462,67 +1468,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1885,11 +1906,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2356,17 +2372,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2374,6 +2393,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2398,6 +2419,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2411,14 +2433,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2452,9 +2474,9 @@ msgstr "Instance %(instance_id)s is not running."
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2588,114 +2610,118 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Invalid volume"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2704,22 +2730,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2801,6 +2827,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3032,14 +3059,18 @@ msgstr "instance %s: suspending"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3502,98 +3533,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3684,6 +3728,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3699,6 +3777,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4094,207 +4187,207 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Virtual Interface creation failed"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4385,671 +4478,691 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "volume %s: creating export"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Invalid instance type %(instance_type)s."
@@ -5169,12 +5282,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5298,34 +5411,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5335,7 +5448,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5677,42 +5790,42 @@ msgstr "killing radvd threw %s"
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid backend: %s"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5874,7 +5987,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6756,7 +6869,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6867,11 +6980,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6882,6 +6990,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6921,10 +7034,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6972,13 +7098,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7163,61 +7294,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7337,7 +7468,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8174,7 +8305,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8530,12 +8661,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8877,101 +9008,101 @@ msgstr "volume %s: created successfully"
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "User does not have admin privileges"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8979,76 +9110,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9056,50 +9202,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9109,67 +9255,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9389,47 +9540,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9437,7 +9589,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9445,7 +9597,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9453,7 +9605,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10826,162 +10978,162 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -10990,66 +11142,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11057,58 +11209,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11458,3 +11610,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 6fd988d9c..21e1ebeac 100644
--- a/nova/locale/en_US/LC_MESSAGES/nova.po
+++ b/nova/locale/en_US/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-01-21 18:28+0000\n"
 "Last-Translator: Jeremy Stanley <fungi@yuggoth.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -196,7 +196,7 @@ msgstr "Invalid input received"
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -686,9 +686,10 @@ msgstr "Zero floating ips exist."
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s not found."
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
-msgstr "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
+msgstr "Cannot disassociate auto assigned floating ip"
 
 #: nova/exception.py:675
 #, python-format
@@ -1010,11 +1011,9 @@ msgstr "Instance Type with ID %(flavor_id)s already exists."
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
-"%(project_id)s combination."
 
 #: nova/exception.py:932
 #, python-format
@@ -1242,25 +1241,30 @@ msgstr "Instance %(instance_uuid)s is locked"
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
@@ -1269,11 +1273,11 @@ msgstr ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr "User data needs to be valid base 64."
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
@@ -1282,19 +1286,19 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "Keypair %(name)s not found for user %(user_id)s"
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, fuzzy, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
@@ -1303,126 +1307,126 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "The CA file for %(project)s could not be found"
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "The CRL file for %(project)s could not be found"
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password is not implemented by this driver."
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Instance Type with name %(name)s already exists."
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Expected object of type: %s"
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1511,69 +1515,84 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr "serve() can only be called once"
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, fuzzy, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Expected object of type: %s"
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Invalid server_string: %s"
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' took %(total_time).2f secs"
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr "Reloading cached file %s"
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Could not remove tmpdir: %s"
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Server name is not a string or unicode"
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "Server name must be less than 256 characters."
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1939,11 +1958,6 @@ msgstr "Disassociate address %s"
 msgid "Floating ip is not associated."
 msgstr "Floating ip is not associated."
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr "Cannot disassociate auto assigned floating ip"
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Image must be available"
@@ -2418,17 +2432,20 @@ msgstr "subclasses must implement construct()!"
 msgid "Initializing extension manager."
 msgstr "Initializing extension manager."
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Invalid is_public filter [%s]"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Invalid minRam filter [%s]"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr "Invalid minDisk filter [%s]"
@@ -2436,6 +2453,8 @@ msgstr "Invalid minDisk filter [%s]"
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr "Image not found."
 
@@ -2460,6 +2479,7 @@ msgid "Invalid metadata key"
 msgstr "Invalid metadata key"
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2473,7 +2493,7 @@ msgstr "Instance does not exist"
 msgid "Instance is not a member of specified network"
 msgstr "Instance is not a member of specified network"
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
@@ -2482,7 +2502,7 @@ msgstr ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr "This request was rate-limited."
 
@@ -2516,9 +2536,9 @@ msgstr "Host '%s' could not be found."
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2652,116 +2672,120 @@ msgstr "Can not find requested image"
 msgid "Invalid key_name provided."
 msgstr "Invalid key_name provided."
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr "HostId cannot be updated."
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "HostId cannot be updated."
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr "Instance has not been resized."
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Argument 'type' for reboot is not HARD or SOFT"
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr "Missing argument 'type' for reboot"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr "Unable to locate requested flavor."
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr "Resize requires a flavor change."
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "%s is a valid instance name"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "Missing imageRef attribute"
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr "Invalid imageRef provided."
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "Missing flavorRef attribute"
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr "No adminPass was specified"
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr "Invalid adminPass"
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Failed to soft reboot instance."
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Unable to parse metadata key/value pairs."
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Resize request has invalid 'flavorRef' attribute."
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Resize requests require 'flavorRef' attribute."
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2770,22 +2794,22 @@ msgstr "Resize requests require 'flavorRef' attribute."
 msgid "Invalid request body"
 msgstr "Invalid request body"
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr "Could not parse imageRef from request."
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr "Cannot find image for rebuild"
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr "createImage entity requires name attribute"
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
@@ -2868,6 +2892,7 @@ msgstr "createBackup attribute 'rotation' must be an integer"
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr "Instance not found"
 
@@ -3107,14 +3132,18 @@ msgstr "Fixed ip %(fixed_ip_id)s not found"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr "Flavor not found."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr "Access list not available for public flavors."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr "No request body"
 
@@ -3589,98 +3618,111 @@ msgstr "Calling extension factory %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr "Instance has had its instance_type removed from the DB"
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, fuzzy, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr "Error processing message.  Skipping it."
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "no method for message: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "Failed to load extension %(ext_factory)s: %(exc)s"
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "no method for message: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, fuzzy, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr "Sending message(s) to: %s"
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, fuzzy, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr "Casted '%(method)s' to compute '%(host)s'"
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Starting migration network for instance %(instance_uuid)s"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Starting migration network for instance %(instance_uuid)s"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3771,6 +3813,40 @@ msgstr "Launching VPN for %s"
 msgid "Failed to load %s"
 msgstr "Failed to create VM %s"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3786,6 +3862,21 @@ msgstr "element is not a child"
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4198,77 +4289,77 @@ msgstr "Metadata property value greater than 255 characters"
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach boot volume to instance %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance type %(instance_type_id)s could not be found."
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "host for instance is down, deleting from database"
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to soft delete instance"
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate instance"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr "Going to try to stop instance"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr "Going to try to start instance"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr "Searching by: %s"
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr "snapshot for %s"
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id is None. Assuming migration."
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4277,63 +4368,63 @@ msgstr ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr "Locking"
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr "Unlocking"
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr "Volume must be attached in order to detach."
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to live migrate instance to %s"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr "Keypair name contains unsafe characters"
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Keypair name must be between 1 and 255 characters long"
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "Security group %s is not a string or unicode"
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Security group %s cannot be empty."
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4342,68 +4433,68 @@ msgstr ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "Security group %s should not be greater than 255 characters."
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr "Quota exceeded, too many security groups."
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr "Security group is still in use"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr "Failed to update usages deallocating security group"
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Rule (%s) not found"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr "Quota exceeded, too many security group rules."
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress %s"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr "Security group id should be integer"
 
@@ -4499,257 +4590,277 @@ msgstr "DB error: %s"
 msgid "Instance type %s not found for deletion"
 msgstr "Instance type %s not found for deletion"
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr "Possibly task preempted."
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr "Instance has been destroyed from under us while trying to set it to ERROR"
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Failed to terminate instance"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Current state is %(drv_state)s, state in DB is %(db_state)s."
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Rebooting instance after nova-compute restart."
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Hypervisor driver does not support resume guests"
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Failed to suspend instance"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Hypervisor driver does not support firewall rules"
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected status code"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr "Checking state"
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Setting up bdm %s"
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr "Retry info not present, will not reschedule"
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, fuzzy, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr "Re-scheduling instance: attempt %d"
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr "Instance build timed out. Set to error state."
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr "Starting instance..."
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Floating ip pool not found."
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
-msgstr "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
+msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Instance network_info: |%s|"
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr "Instance failed block device setup"
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr "Deallocating network for instance"
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s instance"
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignoring DiskNotFound: %s"
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignoring VolumeNotFound: %s"
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "terminating bdm %s"
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr "Ignoring volume cleanup failure due to %s"
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Setting instance vm_state to ERROR"
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr "Rebuilding instance"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s is not on shared storage: %(reason)s"
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Attach boot from volume failed: %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr "Rebooting instance"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4758,25 +4869,25 @@ msgstr ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr "instance snapshotting"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4785,161 +4896,161 @@ msgstr ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Found %(num_images)d images (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Rotating out %d backups"
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Deleting image %s"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Failed to set admin password. Instance %s is not running"
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr "Root password set"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "set_admin_password is not implemented by this driver."
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password failed: %s"
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr "error setting admin password"
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr "Rescuing"
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr "Unrescuing"
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Setting instance to %(state)s state."
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance has no volume."
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "destination same as source!"
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr "Migrating"
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr "Pausing"
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr "Unpausing"
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr "Retrieving diagnostics"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr "Resuming"
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr "Reset network"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr "Inject network info"
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info to inject: |%s|"
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr "Get console output"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "Booting with volume %(volume_id)s at %(mountpoint)s"
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "Attaching volume %(volume_id)s to %(mountpoint)s"
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
@@ -4948,59 +5059,59 @@ msgstr ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "Detach volume %(volume_id)s from mountpoint %(mp)s"
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Faild to detach volume %(volume_id)s from %(mp)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "allocate_for_instance() for %s"
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr "_post_live_migration() is started.."
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -5008,20 +5119,20 @@ msgstr ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr "Post operation of migration started"
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Failed to get info for disk %s"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr "Updated the info_cache for instance"
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -5030,12 +5141,12 @@ msgstr ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr "Setting migration %(migration_id)s to error: %(reason)s"
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
@@ -5044,26 +5155,26 @@ msgstr ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr "In ERROR state"
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, fuzzy, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
@@ -5072,25 +5183,25 @@ msgstr ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr "Failed to generate usage audit for instance on host %s"
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "Updating host status"
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5099,11 +5210,11 @@ msgstr ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr "During sync_power_state the instance has a pending task. Skip."
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
@@ -5112,76 +5223,76 @@ msgstr ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr "Instance shutdown by itself. Calling the stop API."
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr "error during stop() in sync_power_state."
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 #, fuzzy
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 #, fuzzy
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr "Instance is not stopped. Calling the stop API."
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance is not (soft-)deleted."
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, skipping..."
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr "Reclaiming deleted instance"
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Loading compute driver '%s'"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr "No service record for host %s"
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Setting instance to %(state)s state."
@@ -5311,12 +5422,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
@@ -5446,34 +5557,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Unrecognized read_deleted value '%s'"
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
@@ -5483,7 +5594,7 @@ msgstr "instance %s: rescued"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr "Change will make usage less than 0 for the following resources: %(unders)s"
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5840,42 +5951,42 @@ msgstr "killing radvd threw %s"
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid mode: '%s'"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting bridge %s "
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr "Failed to add interface: %s"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr "Starting bridge %s "
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr "Done starting bridge %s"
@@ -6049,7 +6160,7 @@ msgstr "_delete: %s"
 msgid "Cannot delete domain |%s|"
 msgstr "Cannot delete aggregate: %(id)s"
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "v4 subnets are required for legacy nw_info"
 
@@ -6946,7 +7057,7 @@ msgstr "Could not find another compute"
 msgid "Exception during scheduler.run_instance"
 msgstr "Exception during scheduler.run_instance"
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -7062,11 +7173,6 @@ msgstr "No service for compute ID %s"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr "Failed to schedule_%(method)s: %(ex)s"
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -7077,6 +7183,11 @@ msgstr "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -7116,10 +7227,23 @@ msgstr "%(host_state)s is disabled or has not been heard from in a while"
 msgid "%(host_state)s is disabled via capabilities"
 msgstr "%(host_state)s is disabled via capabilities"
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "VCPUs not set; assuming CPU collection broken"
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7179,7 +7303,7 @@ msgstr ""
 "%(host_state)s fails num_instances check: Max instances per host is set "
 "to %(max_instances)s"
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
@@ -7188,6 +7312,11 @@ msgstr ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7373,7 +7502,7 @@ msgstr "200 No Roles"
 msgid "unexpected role header"
 msgstr "unexpected role header"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
@@ -7382,55 +7511,55 @@ msgstr ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "Internal error"
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "After force-killing instances: %s"
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "unknown guestmount error"
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7559,7 +7688,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr "Expected a function in 'auth[1]' parameter"
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8406,7 +8535,7 @@ msgstr "Windows version: %s "
 msgid "get_available_resource called"
 msgstr "get_available_resource called"
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Updating host stats"
@@ -8773,12 +8902,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Using config drive"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Creating config drive at %(path)s"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Creating config drive at %(path)s"
@@ -9118,74 +9247,74 @@ msgstr "Instance soft rebooted successfully."
 msgid "Failed to soft reboot instance."
 msgstr "Failed to soft reboot instance."
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr "Instance shutdown successfully."
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr "Instance rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr "Instance is running"
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "Instance spawned successfully."
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr "Guest does not have a console available"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr "Path '%(path)s' supports direct I/O"
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr "Creating image"
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr "Using config drive"
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Injecting %(injection)s into image %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
@@ -9194,20 +9323,20 @@ msgstr ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr "Config requested a custom CPU model, but no model name was provided"
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr "A CPU model name should not be set when a host CPU model is requested"
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr "CPU mode '%(mode)s' model '%(model)s' was chosen"
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
@@ -9215,7 +9344,7 @@ msgstr ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9223,19 +9352,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9244,33 +9373,48 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, fuzzy, python-format
 msgid "Invalid exclusion expression %r"
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, fuzzy, python-format
 msgid "Invalid inclusion expression %r"
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9279,25 +9423,25 @@ msgstr ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt version is too old (does not support getVersion)"
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Getting image size for the image %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9305,21 +9449,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9328,15 +9472,15 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr "Block migration can not be used with shared storage."
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr "Live migration can not be used without shared storage."
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9345,7 +9489,7 @@ msgstr ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9354,7 +9498,7 @@ msgstr ""
 "Instance launched has CPU info:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9369,7 +9513,7 @@ msgstr ""
 "\n"
 "Refer to %(u)s"
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9378,22 +9522,22 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr "The firewall filter for %s does not exist"
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9402,38 +9546,43 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr "Getting disk size of %(i_name)s: %(e)s"
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Starting migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr "Instance running successfully."
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr "Starting finish_migration"
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr "Starting finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9666,47 +9815,48 @@ msgstr "Path %s must be LVM logical volume"
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr "Can't retrieve root device path from instance libvirt configuration"
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Unexpected error: %s"
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "Ensuring bridge %s"
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr "Failed while unplugging vif"
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9714,7 +9864,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9722,7 +9872,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9730,7 +9880,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -11170,29 +11320,29 @@ msgstr "Invalid value '%s' for xenapi_torrent_images"
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Fetching image %(image_id)s, type %(image_type_str)s"
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image_id)s: %(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -11201,63 +11351,63 @@ msgstr ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr "Failed to fetch glance image"
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Detected %(image_type_str)s format for image %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "Flag sr_matching_filter '%s' does not respect formatting convention"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
@@ -11267,50 +11417,50 @@ msgstr ""
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr "Cannot find SR of content-type ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr "ISO: not iso content"
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO: iso content_type, no 'i18n-key' key"
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR MATCHing our criteria"
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, looking to see if it is host local"
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR with local PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -11319,22 +11469,22 @@ msgstr ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "Invalid statistics data from Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -11343,66 +11493,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Timeout waiting for device %s to be created"
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr "Disconnecting stale VDI %s from compute domU"
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11410,16 +11560,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr "Partitions:"
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -11428,19 +11578,19 @@ msgstr ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
@@ -11449,7 +11599,7 @@ msgstr ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
@@ -11458,16 +11608,16 @@ msgstr ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr "Manipulating interface files directly"
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "Failed to mount filesystem (expected for non-linux instances): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr "This domU must be running on the host specified by xenapi_connection_url"
 
@@ -11825,3 +11975,21 @@ msgstr "status must be available"
 msgid "status must be 'available'"
 msgstr "status must be available"
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr "Cannot disassociate auto assigined floating ip"
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+
+#~ msgid "Instance failed network setup"
+#~ msgstr "Instance failed network setup"
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr "Failed to schedule_%(method)s: %(ex)s"
+
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 9eece07f5..ce6d2a626 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-05-16 06:44+0000\n"
 "Last-Translator: Paco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -200,7 +200,7 @@ msgstr "Entrada invalida recibida"
 msgid "Invalid volume"
 msgstr "Volumen inválido"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -678,8 +678,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -987,7 +988,7 @@ msgstr "el grupo %s ya existe"
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1211,180 +1212,185 @@ msgstr "La instacia %(instance_id)s no esta suspendida"
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1473,67 +1479,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Depuración de la devolución de llamada: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "No se encuentra la dirección del enlace local.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "No se pudo obtener enlace de la ip local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "backend inválido: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1900,11 +1921,6 @@ msgstr "Desasociar dirección %s"
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2371,17 +2387,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Firma invalida para el usuario %s"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Firma invalida para el usuario %s"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2389,6 +2408,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2413,6 +2434,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2426,14 +2448,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2468,9 +2490,9 @@ msgstr "La instacia %(instance_id)s no esta suspendida"
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2604,117 +2626,121 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Punto de montaje no puede ser traducido: %s"
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Punto de montaje no puede ser traducido: %s"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "instancia %s: rescatada"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2723,22 +2749,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2820,6 +2846,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3053,14 +3080,18 @@ msgstr "configurando la red del host"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3530,98 +3561,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3712,6 +3756,40 @@ msgstr "Lanzando VPN para %s"
 msgid "Failed to load %s"
 msgstr "Imposible encontrar volumen %s"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3727,6 +3805,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4132,213 +4225,213 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4429,20 +4522,20 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4451,655 +4544,675 @@ msgstr ""
 "Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
 "(%(host)s)"
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instancia %s: reiniciada"
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
@@ -5219,12 +5332,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5351,34 +5464,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instancia %s: rescatada"
@@ -5388,7 +5501,7 @@ msgstr "instancia %s: rescatada"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5731,42 +5844,42 @@ msgstr "Matando radvd lanzado %s"
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d corrupto, relanzando radvd"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "backend inválido: %s"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Iniciando interfaz VLAN %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Des-registrando la imagen %s"
@@ -5928,7 +6041,7 @@ msgstr "recibido %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6814,7 +6927,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6927,11 +7040,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6942,6 +7050,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6981,10 +7094,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7032,13 +7158,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7223,61 +7354,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Después de terminar las instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7398,7 +7529,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8237,7 +8368,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8593,12 +8724,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8942,101 +9073,101 @@ msgstr "instancia %s: reiniciada"
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9044,76 +9175,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9121,50 +9267,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9174,67 +9320,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9454,47 +9605,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9502,7 +9654,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9510,7 +9662,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9518,7 +9670,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10904,229 +11056,229 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Tamaño para imagen %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando VDI %s a /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destruído"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Buscando vid %s para el kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s está todavía disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s tiene origen en %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Ejecutando pygrub contra %s"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen Encontrado %s"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen no encontrado. Reiniciando HVM"
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11134,58 +11286,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11538,3 +11690,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/fi_FI/LC_MESSAGES/nova.po b/nova/locale/fi_FI/LC_MESSAGES/nova.po
index 825b13e15..71fb97868 100644
--- a/nova/locale/fi_FI/LC_MESSAGES/nova.po
+++ b/nova/locale/fi_FI/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-18 19:07+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Finnish (Finland) "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 0a5c536f9..d893ba18d 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-05-14 08:35+0000\n"
 "Last-Translator: Erwan Gallen <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -198,7 +198,7 @@ msgstr "Entrée invalide reçue"
 msgid "Invalid volume"
 msgstr "Volume invalide"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -694,8 +694,9 @@ msgstr "Aucunes IPs dynamiques existes."
 msgid "Interface %(interface)s not found."
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -1015,7 +1016,7 @@ msgstr "L'IP dynamique %(address)s est associée."
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1241,43 +1242,48 @@ msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
@@ -1286,137 +1292,137 @@ msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "La paire de clés %(name)s est introuvable pour l'utilisateur %(user_id)s"
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Le projet %(project_id)s n'a pas été trouvé."
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Le type d'instance avec le nom %(instance_type_name)s ne peut être trouvé."
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1505,67 +1511,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "L'adresse du lien local n'a pas été trouvé :%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Impossible de trouver l'IP du lien local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1945,11 +1966,6 @@ msgstr "Désassociation de l'adresse %s"
 msgid "Floating ip is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2418,17 +2434,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Signature non valide pour l'utilisateur %s"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Signature non valide pour l'utilisateur %s"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2436,6 +2455,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2460,6 +2481,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2473,14 +2495,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2515,9 +2537,9 @@ msgstr "L'hôte %(host)s ne peut pas être trouvé."
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2651,117 +2673,121 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "instance %s: récupérée"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2770,22 +2796,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2867,6 +2893,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3101,14 +3128,18 @@ msgstr "Le certificat %(certificate_id)s non trouvé."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3581,98 +3612,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3763,6 +3807,40 @@ msgstr "Démarrage du VPN pour %s"
 msgid "Failed to load %s"
 msgstr "Impossible de trouver le volume %s"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3778,6 +3856,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4185,213 +4278,213 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Le type d'instance %(instance_type_id)s ne peut être trouvé."
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorisation du groupe de sécurité %s"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4482,20 +4575,20 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4504,658 +4597,678 @@ msgstr ""
 "Impossible de migrer l'instance (%(instance_id)s) vers l'hôte actuel "
 "(%(host)s)."
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: re-démarrée"
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: a démarrée"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
@@ -5276,12 +5389,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5408,34 +5521,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: récupérée"
@@ -5445,7 +5558,7 @@ msgstr "instance %s: récupérée"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5789,42 +5902,42 @@ msgstr "La destruction de radvd à renvoyé %s"
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d est dépassé, re-démarrage radvd"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Backend invalide : %s"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Démarrage de l'interface VLAN %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Erreur au démarrage xvp : %s"
@@ -5987,7 +6100,7 @@ msgstr "%s reçu"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6877,7 +6990,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6990,11 +7103,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -7005,6 +7113,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -7044,10 +7157,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7095,13 +7221,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7286,61 +7417,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "Instance actives : %s"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Après l'arrêt d'instances : %s"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7461,7 +7592,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8304,7 +8435,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8660,12 +8791,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Début de la destruction d'instance"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Injection du chemin d'accès : '%s'"
@@ -9011,103 +9142,103 @@ msgstr "instance %s: re-démarrée"
 msgid "Failed to soft reboot instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 "instance %(inst_name)s : l'erreur d'injection de donné dans l'image "
 "%(img_id)s (%(e)s) a été ignorée"
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9115,76 +9246,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9192,50 +9338,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9245,67 +9391,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9525,47 +9676,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9573,7 +9725,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9581,7 +9733,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9589,7 +9741,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10978,163 +11130,163 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Taille de l'image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copie de VDI %s vers /boot/guest sur dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Noyau/Ramdisk VDI %s détruit"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Recherche du VDI %s pour le PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "Le VDI %s est toujours disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-parcours de SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -11143,66 +11295,66 @@ msgstr ""
 "L'UUID parent %(parent_uuid)s ne correspond pas au parent originel "
 "%(original_parent_uuid)s, attente de coalesence..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Connexion de VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Connexion de VBD %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruction de VBD pour la VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destruction de VBD pour la VDI %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Exécution de pygrub sur %s"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen %s trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Pas de kernel Xen trouvé.  Démarrage en HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11210,58 +11362,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Ecriture de la table de partitionnement %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11617,3 +11769,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/hr/LC_MESSAGES/nova.po b/nova/locale/hr/LC_MESSAGES/nova.po
index ec138bb0d..1d74f36a3 100644
--- a/nova/locale/hr/LC_MESSAGES/nova.po
+++ b/nova/locale/hr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -195,7 +195,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -664,8 +664,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -973,7 +974,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1197,180 +1198,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1458,67 +1464,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1881,11 +1902,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2349,17 +2365,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2367,6 +2386,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2391,6 +2412,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2404,14 +2426,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2445,9 +2467,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2581,111 +2603,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2694,22 +2720,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2791,6 +2817,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3018,14 +3045,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3486,97 +3517,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3667,6 +3711,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3682,6 +3760,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4074,205 +4167,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4362,657 +4455,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5132,12 +5245,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5260,34 +5373,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5297,7 +5410,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5639,42 +5752,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5835,7 +5948,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6709,7 +6822,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6820,11 +6933,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6835,6 +6943,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6874,10 +6987,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6925,13 +7051,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7116,61 +7247,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7290,7 +7421,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8120,7 +8251,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8472,12 +8603,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8810,100 +8941,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8911,76 +9042,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8988,50 +9134,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9041,67 +9187,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9321,47 +9472,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9369,7 +9521,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9377,7 +9529,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9385,7 +9537,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10747,228 +10899,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10976,58 +11128,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11374,3 +11526,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/hu/LC_MESSAGES/nova.po b/nova/locale/hu/LC_MESSAGES/nova.po
index de558e9b4..e401e58a6 100644
--- a/nova/locale/hu/LC_MESSAGES/nova.po
+++ b/nova/locale/hu/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/id/LC_MESSAGES/nova.po b/nova/locale/id/LC_MESSAGES/nova.po
index 0eec79de0..551fd014c 100644
--- a/nova/locale/id/LC_MESSAGES/nova.po
+++ b/nova/locale/id/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index b13a1ccd7..9a1aec0cf 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-04-01 18:59+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -194,7 +194,7 @@ msgstr "E' stato ricevuto un input non valido"
 msgid "Invalid volume"
 msgstr "Volume non valido"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -666,8 +666,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -975,7 +976,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1199,180 +1200,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1461,67 +1467,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1884,11 +1905,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2354,17 +2370,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2372,6 +2391,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2396,6 +2417,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2409,14 +2431,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2450,9 +2472,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2586,114 +2608,118 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Volume non valido"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2702,22 +2728,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2799,6 +2825,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3030,14 +3057,18 @@ msgstr "istanza %s: sospensione in corso"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3501,98 +3532,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3683,6 +3727,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Impossibile localizzare il volume %s"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3698,6 +3776,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4094,209 +4187,209 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4387,669 +4480,689 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5169,12 +5282,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5301,34 +5414,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5338,7 +5451,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5681,42 +5794,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Avviando l'interfaccia VLAN %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5878,7 +5991,7 @@ msgstr "ricevuto %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6759,7 +6872,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6870,11 +6983,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6885,6 +6993,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6924,10 +7037,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6975,13 +7101,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7166,61 +7297,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7340,7 +7471,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8178,7 +8309,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8533,12 +8664,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8882,101 +9013,101 @@ msgstr "volume %s: creato con successo"
 msgid "Failed to soft reboot instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8984,76 +9115,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9061,50 +9207,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9114,67 +9260,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9394,47 +9545,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9442,7 +9594,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9450,7 +9602,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9458,7 +9610,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10825,229 +10977,229 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s distrutti"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Cercando vdi %s per kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11055,58 +11207,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11457,3 +11609,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/it_IT/LC_MESSAGES/nova.po b/nova/locale/it_IT/LC_MESSAGES/nova.po
index a4df18fe8..e8417067e 100644
--- a/nova/locale/it_IT/LC_MESSAGES/nova.po
+++ b/nova/locale/it_IT/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (Italy) "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index b5fa567d0..28a8f66e5 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2011-08-23 11:22+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: \n"
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -668,8 +668,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -977,7 +978,7 @@ msgstr "グループ %s �既�存在�����。"
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1201,180 +1202,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s を�止�よ�������"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "%s を�止�よ�������"
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s �デ�イス %(device)s �接続"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1463,67 +1469,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "コール�ック中�デ�ッグ: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "リンクローカルアドレス�見��り��ん: %s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "%(interface)s �ローカルIPアドレス�リンク��得����ん:%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "�正��ックエンド��: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1890,11 +1911,6 @@ msgstr "Disassociate address: アドレス %s ã�®é–¢é€£ä»˜ã�‘を解除ã�—ã�¾ã�™ã
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2359,17 +2375,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Invalid signature: ユーザ %s �署���正��。"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Invalid signature: ユーザ %s �署���正��。"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2377,6 +2396,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2401,6 +2422,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2414,14 +2436,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2456,9 +2478,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2592,116 +2614,120 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "マウント�イントを変�����ん。 %s"
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "マウント�イントを変�����ん。 %s"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "インスタンス %s: rescued"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2710,22 +2736,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2807,6 +2833,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3040,14 +3067,18 @@ msgstr "�ットワークホスト�設定を���。"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3516,98 +3547,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "メッセージ %s �対�るメソッド�存在���ん。"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "メッセージ %s �対�るメソッド�存在���ん。"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3698,6 +3742,40 @@ msgstr "%s 用�VPNを起動���。"
 msgid "Failed to load %s"
 msgstr "ボリューム %s �存在�確�����ん。"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3713,6 +3791,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4114,213 +4207,213 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "インスタンス %s �ボリュームを接続(attach)����ん。"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個�インスタンス�起動を始���…"
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "VM %s �対�るスナップショットを開始���。"
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作����。"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "VBD %s �削除�失敗����。"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "VBD %s �削除�失敗����。"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress: セキュリティグループ許� %s ��消"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress: セキュリティグループ許� %s"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress: セキュリティグループ許� %s ��消"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4411,678 +4504,698 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "予期���エラー発生: %s"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance: インスタンス %s を�起動���。"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume: ボリューム %s をデタッ����"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance: インスタンス %s を�起動���。"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "インスタンス%s: �起動����。"
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "snapshotting: インスタンス %s �スナップショットを�得中"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキュー���。"
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "snapshotting: インスタンス %s �スナップショットを�得中"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s �診断情報を�得���。"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "コンソールを追加�����"
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "コンソールを追加�����"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "ボリュームを未知�インスタンス %s �らデタッ����。"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user: ユーザ %s を削除���。"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user: ユーザ %s を削除���。"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5202,12 +5315,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5331,34 +5444,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "インスタンス %s: rescued"
@@ -5368,7 +5481,7 @@ msgstr "インスタンス %s: rescued"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5711,42 +5824,42 @@ msgstr "radvd  �止� %s 例外を発行����"
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d �ストール���る�� radvd を�実行�����…"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "�正��ックエンド��: %s"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "VLANインタフェース %s を開始���。"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "%s 用�ブリッジインタフェースを開始���。"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "プライベートキー�復��失敗����: %s"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "%s 用�ブリッジインタフェースを開始���。"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "xvp �開始中�エラー: %s"
@@ -5908,7 +6021,7 @@ msgstr "�信： %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6792,7 +6905,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6903,11 +7016,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6918,6 +7026,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6957,10 +7070,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7008,13 +7134,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7199,61 +7330,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "インスタンス %s �実行中��。"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "インスタンス %s を終了��後��。"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7374,7 +7505,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8211,7 +8342,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8567,12 +8698,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "ファイルパス '%s' を埋�込ん����"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "ファイルパス '%s' を埋�込ん����"
@@ -8915,100 +9046,100 @@ msgstr "インスタンス%s: �起動����。"
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "ID %(image_id)s ��� %(vdi_uuids)s �アップロード�為� xapi を����������"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "インスタンス %(inst_name)s: イメージ %(img_id)s ��データ埋�込��エラーを無視����� (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9016,76 +9147,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9093,50 +9239,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9146,67 +9292,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9426,47 +9577,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9474,7 +9626,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9482,7 +9634,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9490,7 +9642,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10868,230 +11020,230 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "イメージ %(image_location)s � ID %(image_id)s �登録�れ���"
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "イメージ %(image)s �サイズ:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "ドメイン0 上� /boot/guest � VDI %s をコピー中"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "カー�ル/RAMディスク VDI %s �削除�れ���"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "PV kernel�vdi %s を�得���。"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s ��然���存在�����。"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "SR %s を�スキャン���。"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s �親� %(parent_ref)s ��"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "親 %(parent_uuid)s �元々�親 %(original_parent_uuid)s �一致���ん。作�を待機�����…"
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "VBD %s を接続�����… "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "仮想ブロックデ�イス(VBD) %s �接続�完了����。"
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "VDI %s 用�仮想ブロックデ�イス(VBD)を削除�����… "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "VDI %s 用�仮想ブロックデ�イス(VBD)�削除�完了����。"
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "%s �対�� pygrub を実行�����"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Xen Kernel %s �見��り���。"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 "No Xen kernel found.  Booting HVM.\r\n"
 "Xen 用カー�ル�見��り��ん。完全仮想化モード(HVM)�起動�����。"
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11099,58 +11251,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "パーティションテーブル %s �書�込��完了����。"
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11505,3 +11657,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ka_GE/LC_MESSAGES/nova.po b/nova/locale/ka_GE/LC_MESSAGES/nova.po
index 5a60f3802..ce47d1de7 100644
--- a/nova/locale/ka_GE/LC_MESSAGES/nova.po
+++ b/nova/locale/ka_GE/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Georgian (Georgia) "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 0b565f2d0..8797a6d92 100644
--- a/nova/locale/ko/LC_MESSAGES/nova.po
+++ b/nova/locale/ko/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2011-12-16 04:42+0000\n"
 "Last-Translator: Zhongyue Luo <lzyeval@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,112 +2602,116 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2694,22 +2720,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2791,6 +2817,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3021,14 +3048,18 @@ msgstr "�스턴스 %s: 스냅샷 저장중"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3490,98 +3521,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3672,6 +3716,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "%s 볼륨� 찾�수 없습니다"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3687,6 +3765,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4080,206 +4173,206 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "%s 볼륨� 찾�수 없습니다"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "%s 볼륨� 찾�수 없습니다"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4369,665 +4462,685 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "%s 볼륨 탈착� 실패했습니다"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5147,12 +5260,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5275,34 +5388,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5312,7 +5425,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5654,42 +5767,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5850,7 +5963,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6724,7 +6837,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6835,11 +6948,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6850,6 +6958,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6889,10 +7002,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6940,13 +7066,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7131,61 +7262,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7305,7 +7436,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8141,7 +8272,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8495,12 +8626,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8840,100 +8971,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8941,76 +9072,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "%s 볼륨 탈착� 실패했습니다"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9018,50 +9164,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9071,67 +9217,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9351,47 +9502,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9399,7 +9551,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9407,7 +9559,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9415,7 +9567,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10780,228 +10932,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11009,58 +11161,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11409,3 +11561,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova.po b/nova/locale/ko_KR/LC_MESSAGES/nova.po
index 28bc3a6e7..7e8e3b3dd 100644
--- a/nova/locale/ko_KR/LC_MESSAGES/nova.po
+++ b/nova/locale/ko_KR/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-06 16:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -194,7 +194,7 @@ msgstr "입력 값� 정확하지 않습니다."
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,112 +2602,116 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "입력 값� 정확하지 않습니다."
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2694,22 +2720,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2791,6 +2817,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3018,14 +3045,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3486,98 +3517,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "�스턴스 재시작 실패"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3668,6 +3712,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3683,6 +3761,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4075,205 +4168,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4363,657 +4456,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5133,12 +5246,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5261,34 +5374,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5298,7 +5411,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5640,42 +5753,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5836,7 +5949,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6710,7 +6823,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6821,11 +6934,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6836,6 +6944,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6875,10 +6988,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6926,13 +7052,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7117,61 +7248,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7291,7 +7422,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8121,7 +8252,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8473,12 +8604,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8811,100 +8942,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8912,76 +9043,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8989,50 +9135,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9042,67 +9188,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9322,47 +9473,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9370,7 +9522,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9378,7 +9530,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9386,7 +9538,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10748,228 +10900,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10977,58 +11129,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11376,3 +11528,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ms/LC_MESSAGES/nova.po b/nova/locale/ms/LC_MESSAGES/nova.po
index 8148594ee..604c6f20d 100644
--- a/nova/locale/ms/LC_MESSAGES/nova.po
+++ b/nova/locale/ms/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index 5dc61e4a3..b0779ac7e 100644
--- a/nova/locale/nb/LC_MESSAGES/nova.po
+++ b/nova/locale/nb/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-09-13 10:30+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: nb <LL@li.org>\n"
@@ -195,7 +195,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -664,8 +664,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -973,7 +974,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1197,180 +1198,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1458,67 +1464,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Tjenernavn er ikke en streng eller unicode"
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1881,11 +1902,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2350,17 +2366,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2368,6 +2387,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2392,6 +2413,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2405,14 +2427,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2446,9 +2468,9 @@ msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2582,114 +2604,118 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Ressurs ble ikke funnet."
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "Ressurs ble ikke funnet."
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Ugyldig snapshot"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2698,22 +2724,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2795,6 +2821,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3023,14 +3050,18 @@ msgstr "Metadata element ble ikke funnet"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3495,97 +3526,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "Kunne ikke laste utvidelse %(ext_factory)s: %(exc)s"
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3676,6 +3720,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Kan ikke finne adressen %r"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3691,6 +3769,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4085,205 +4178,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4373,657 +4466,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Kunne ikke hente metadata for ip:% s"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5143,12 +5256,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5271,34 +5384,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5308,7 +5421,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5650,42 +5763,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5847,7 +5960,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6723,7 +6836,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6834,11 +6947,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6849,6 +6957,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6888,10 +7001,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6939,13 +7065,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7131,61 +7262,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7306,7 +7437,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8138,7 +8269,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8490,12 +8621,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8830,100 +8961,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8931,76 +9062,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9008,50 +9154,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9061,67 +9207,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9341,47 +9492,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9389,7 +9541,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9397,7 +9549,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9405,7 +9557,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10770,228 +10922,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10999,58 +11151,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11398,3 +11550,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nl_NL/LC_MESSAGES/nova.po b/nova/locale/nl_NL/LC_MESSAGES/nova.po
index 875e5f373..50411463d 100644
--- a/nova/locale/nl_NL/LC_MESSAGES/nova.po
+++ b/nova/locale/nl_NL/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Dutch (Netherlands) "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 8d87f807b..2363ef17e 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: nova jenkins.nova.propose.translation.update.289\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.291\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -662,8 +662,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -971,7 +972,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1195,180 +1196,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1456,67 +1462,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1879,11 +1900,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2347,17 +2363,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2365,6 +2384,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2389,6 +2410,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2402,14 +2424,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2443,9 +2465,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2579,111 +2601,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2692,22 +2718,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2789,6 +2815,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3016,14 +3043,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3484,97 +3515,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3665,6 +3709,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3680,6 +3758,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4072,205 +4165,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4360,657 +4453,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5130,12 +5243,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5258,34 +5371,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5295,7 +5408,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5637,42 +5750,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5833,7 +5946,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6707,7 +6820,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6818,11 +6931,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6833,6 +6941,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6872,10 +6985,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6923,13 +7049,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7114,61 +7245,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7288,7 +7419,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8118,7 +8249,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8470,12 +8601,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8808,100 +8939,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8909,76 +9040,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8986,50 +9132,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9039,67 +9185,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9319,47 +9470,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9367,7 +9519,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9375,7 +9527,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9383,7 +9535,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10745,228 +10897,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10974,58 +11126,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
diff --git a/nova/locale/pl_PL/LC_MESSAGES/nova.po b/nova/locale/pl_PL/LC_MESSAGES/nova.po
new file mode 100644
index 000000000..407d60c86
--- /dev/null
+++ b/nova/locale/pl_PL/LC_MESSAGES/nova.po
@@ -0,0 +1,11528 @@
+# Polish (Poland) translations for nova.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the nova project.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version:  Nova\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
+"PO-Revision-Date: 2013-06-28 18:59+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language-Team: Polish (Poland) "
+"(http://www.transifex.com/projects/p/openstack/language/pl_PL/)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && "
+"(n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
+#, python-format
+msgid "block_device_list %s"
+msgstr ""
+
+#: nova/context.py:63
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:108
+#, python-format
+msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
+msgstr ""
+
+#: nova/crypto.py:55
+msgid "Filename of root CA"
+msgstr ""
+
+#: nova/crypto.py:58
+msgid "Filename of private key"
+msgstr ""
+
+#: nova/crypto.py:61
+msgid "Filename of root Certificate Revocation List"
+msgstr ""
+
+#: nova/crypto.py:64
+msgid "Where we keep our keys"
+msgstr ""
+
+#: nova/crypto.py:67
+msgid "Where we keep our root CA"
+msgstr ""
+
+#: nova/crypto.py:70
+msgid "Should we use a CA for each project?"
+msgstr ""
+
+#: nova/crypto.py:74
+#, python-format
+msgid "Subject for certificate for users, %s for project, user, timestamp"
+msgstr ""
+
+#: nova/crypto.py:79
+#, python-format
+msgid "Subject for certificate for projects, %s for project, timestamp"
+msgstr ""
+
+#: nova/crypto.py:210
+msgid "Unable to find the key"
+msgstr ""
+
+#: nova/crypto.py:393
+msgid "Failed to write inbound.csr"
+msgstr ""
+
+#: nova/crypto.py:395
+#, python-format
+msgid "Flags path: %s"
+msgstr ""
+
+#: nova/exception.py:113
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
+msgid "Exception in string format operation"
+msgstr ""
+
+#: nova/exception.py:155
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:165
+#, python-format
+msgid "Failed to encrypt text: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:169
+#, python-format
+msgid "Failed to decrypt text: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:173
+msgid "Virtual Interface creation failed"
+msgstr ""
+
+#: nova/exception.py:177
+msgid "5 attempts to create virtual interfacewith unique mac address failed"
+msgstr ""
+
+#: nova/exception.py:182
+#, python-format
+msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:187
+msgid "Not authorized."
+msgstr ""
+
+#: nova/exception.py:192
+msgid "User does not have admin privileges"
+msgstr ""
+
+#: nova/exception.py:196
+#, python-format
+msgid "Policy doesn't allow %(action)s to be performed."
+msgstr ""
+
+#: nova/exception.py:200
+#, python-format
+msgid "Image %(image_id)s is not active."
+msgstr ""
+
+#: nova/exception.py:204
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:208
+msgid "Unacceptable parameters."
+msgstr ""
+
+#: nova/exception.py:213
+msgid "Block Device Mapping is Invalid."
+msgstr ""
+
+#: nova/exception.py:217
+#, python-format
+msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
+msgstr ""
+
+#: nova/exception.py:222
+#, python-format
+msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
+msgstr ""
+
+#: nova/exception.py:227
+msgid ""
+"Block Device Mapping is Invalid: some fields are not recognized, or have "
+"invalid values."
+msgstr ""
+
+#: nova/exception.py:233
+msgid "Block Device Mapping cannot be converted to legacy format. "
+msgstr ""
+
+#: nova/exception.py:238
+#, python-format
+msgid "Volume %(volume_id)s is not attached to anything"
+msgstr ""
+
+#: nova/exception.py:242
+#, python-format
+msgid ""
+"Volume %(volume_id)s did not finish being created even after we waited "
+"%(seconds)s seconds or %(attempts)s attempts."
+msgstr ""
+
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
+msgid "Keypair data is invalid"
+msgstr ""
+
+#: nova/exception.py:252
+msgid "The request is invalid."
+msgstr ""
+
+#: nova/exception.py:256
+msgid "Invalid input received"
+msgstr ""
+
+#: nova/exception.py:260
+msgid "Invalid volume"
+msgstr ""
+
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/contrib/admin_actions.py:242
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:268
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:272
+#, python-format
+msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
+msgstr ""
+
+#: nova/exception.py:276
+#, python-format
+msgid "Invalid IP protocol %(protocol)s."
+msgstr ""
+
+#: nova/exception.py:280
+#, python-format
+msgid "Invalid content type %(content_type)s."
+msgstr ""
+
+#: nova/exception.py:284
+#, python-format
+msgid "Invalid cidr %(cidr)s."
+msgstr ""
+
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: nova/exception.py:295
+#, python-format
+msgid "%(err)s"
+msgstr ""
+
+#: nova/exception.py:299
+#, python-format
+msgid ""
+"Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
+" %(reason)s."
+msgstr ""
+
+#: nova/exception.py:304
+#, python-format
+msgid "Group not valid. Reason: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: nova/exception.py:312
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
+" the instance is in this state."
+msgstr ""
+
+#: nova/exception.py:317
+#, python-format
+msgid "Instance %(instance_id)s is not running."
+msgstr ""
+
+#: nova/exception.py:321
+#, python-format
+msgid "Instance %(instance_id)s is not in rescue mode"
+msgstr ""
+
+#: nova/exception.py:325
+#, python-format
+msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:329
+#, python-format
+msgid "Instance %(instance_id)s is not ready"
+msgstr ""
+
+#: nova/exception.py:333
+msgid "Failed to suspend instance"
+msgstr ""
+
+#: nova/exception.py:337
+#, python-format
+msgid "Failed to resume instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:341
+#, python-format
+msgid "Failed to power on instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:345
+#, python-format
+msgid "Failed to power off instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:349
+msgid "Failed to reboot instance"
+msgstr ""
+
+#: nova/exception.py:353
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:357
+msgid "Failed to deploy instance"
+msgstr ""
+
+#: nova/exception.py:361
+msgid "Service is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:365
+msgid "Insufficient compute resources."
+msgstr ""
+
+#: nova/exception.py:369
+#, python-format
+msgid "Compute service of %(host)s is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:373
+#, python-format
+msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
+msgstr ""
+
+#: nova/exception.py:378
+msgid "The supplied hypervisor type of is invalid."
+msgstr ""
+
+#: nova/exception.py:382
+msgid "The instance requires a newer hypervisor version than has been provided."
+msgstr ""
+
+#: nova/exception.py:387
+#, python-format
+msgid ""
+"The supplied disk path (%(path)s) already exists, it is expected not to "
+"exist."
+msgstr ""
+
+#: nova/exception.py:392
+#, python-format
+msgid "The supplied device path (%(path)s) is invalid."
+msgstr ""
+
+#: nova/exception.py:396
+#, python-format
+msgid "The supplied device path (%(path)s) is in use."
+msgstr ""
+
+#: nova/exception.py:401
+#, python-format
+msgid "The supplied device (%(device)s) is busy."
+msgstr ""
+
+#: nova/exception.py:405
+msgid "Unacceptable CPU info"
+msgstr ""
+
+#: nova/exception.py:409
+#, python-format
+msgid "%(address)s is not a valid IP v4/6 address."
+msgstr ""
+
+#: nova/exception.py:413
+#, python-format
+msgid ""
+"VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
+"tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
+msgstr ""
+
+#: nova/exception.py:419
+#, python-format
+msgid ""
+"vSwitch which contains the port group %(bridge)s is not associated with "
+"the desired physical adapter. Expected vSwitch is %(expected)s, but the "
+"one associated is %(actual)s."
+msgstr ""
+
+#: nova/exception.py:426
+#, python-format
+msgid "Disk format %(disk_format)s is not acceptable"
+msgstr ""
+
+#: nova/exception.py:430
+#, python-format
+msgid "Image %(image_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:434
+#, python-format
+msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:438
+#, python-format
+msgid "Ec2 id %(ec2_id)s is unacceptable."
+msgstr ""
+
+#: nova/exception.py:442
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
+msgstr ""
+
+#: nova/exception.py:446
+#, python-format
+msgid "Invalid ID received %(id)s."
+msgstr ""
+
+#: nova/exception.py:450
+msgid "Constraint not met."
+msgstr ""
+
+#: nova/exception.py:455
+msgid "Resource could not be found."
+msgstr ""
+
+#: nova/exception.py:460
+#, python-format
+msgid "No agent-build associated with id %(id)s."
+msgstr ""
+
+#: nova/exception.py:464
+#, python-format
+msgid "Volume %(volume_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:468
+#, python-format
+msgid "Snapshot %(snapshot_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:472
+#, python-format
+msgid "No target id found for volume %(volume_id)s."
+msgstr ""
+
+#: nova/exception.py:476
+#, python-format
+msgid "No disk at %(location)s"
+msgstr ""
+
+#: nova/exception.py:480
+#, python-format
+msgid "Could not find a handler for %(driver_type)s volume."
+msgstr ""
+
+#: nova/exception.py:484
+#, python-format
+msgid "Invalid image href %(image_href)s."
+msgstr ""
+
+#: nova/exception.py:488
+#, python-format
+msgid "Image %(image_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:492
+#, python-format
+msgid ""
+"Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
+" dynamically when they are listed for the first time. Have you listed "
+"image ids since adding this image?"
+msgstr ""
+
+#: nova/exception.py:499
+#, python-format
+msgid "Project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:503
+msgid "Cannot find SR to read/write VDI."
+msgstr ""
+
+#: nova/exception.py:507
+#, python-format
+msgid "Network %(network_id)s is duplicated."
+msgstr ""
+
+#: nova/exception.py:511
+#, python-format
+msgid "Network %(network_id)s is still in use."
+msgstr ""
+
+#: nova/exception.py:515
+#, python-format
+msgid "%(req)s is required to create a network."
+msgstr ""
+
+#: nova/exception.py:519
+#, python-format
+msgid "Network %(network_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:523
+#, python-format
+msgid "Port id %(port_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:527
+#, python-format
+msgid "Network could not be found for bridge %(bridge)s"
+msgstr ""
+
+#: nova/exception.py:531
+#, python-format
+msgid "Network could not be found for uuid %(uuid)s"
+msgstr ""
+
+#: nova/exception.py:535
+#, python-format
+msgid "Network could not be found with cidr %(cidr)s."
+msgstr ""
+
+#: nova/exception.py:539
+#, python-format
+msgid "Network could not be found for instance %(instance_id)s."
+msgstr ""
+
+#: nova/exception.py:543
+msgid "No networks defined."
+msgstr ""
+
+#: nova/exception.py:547
+#, python-format
+msgid ""
+"Either Network uuid %(network_uuid)s is not present or is not assigned to"
+" the project %(project_id)s."
+msgstr ""
+
+#: nova/exception.py:552
+msgid "Could not find the datastore reference(s) which the VM uses."
+msgstr ""
+
+#: nova/exception.py:556
+#, python-format
+msgid "Port %(port_id)s is still in use."
+msgstr ""
+
+#: nova/exception.py:560
+#, python-format
+msgid "Port %(port_id)s not usable for instance %(instance)s."
+msgstr ""
+
+#: nova/exception.py:564
+#, python-format
+msgid "No free port available for instance %(instance)s."
+msgstr ""
+
+#: nova/exception.py:568
+#, python-format
+msgid "No fixed IP associated with id %(id)s."
+msgstr ""
+
+#: nova/exception.py:572
+#, python-format
+msgid "Fixed ip not found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:576
+#, python-format
+msgid "Instance %(instance_uuid)s has zero fixed ips."
+msgstr ""
+
+#: nova/exception.py:580
+#, python-format
+msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
+msgstr ""
+
+#: nova/exception.py:585
+#, python-format
+msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
+msgstr ""
+
+#: nova/exception.py:589
+#, python-format
+msgid ""
+"Fixed IP address (%(address)s) does not exist in network "
+"(%(network_uuid)s)."
+msgstr ""
+
+#: nova/exception.py:594
+#, python-format
+msgid ""
+"Fixed IP address %(address)s is already in use on instance "
+"%(instance_uuid)s."
+msgstr ""
+
+#: nova/exception.py:599
+#, python-format
+msgid "More than one instance is associated with fixed ip address '%(address)s'."
+msgstr ""
+
+#: nova/exception.py:604
+#, python-format
+msgid "Fixed IP address %(address)s is invalid."
+msgstr ""
+
+#: nova/exception.py:608
+msgid "Zero fixed ips available."
+msgstr ""
+
+#: nova/exception.py:612
+msgid "Zero fixed ips could be found."
+msgstr ""
+
+#: nova/exception.py:621
+#, python-format
+msgid "Floating ip %(address)s already exists."
+msgstr ""
+
+#: nova/exception.py:625
+#, python-format
+msgid "Floating ip not found for id %(id)s."
+msgstr ""
+
+#: nova/exception.py:629
+#, python-format
+msgid "The DNS entry %(name)s already exists in domain %(domain)s."
+msgstr ""
+
+#: nova/exception.py:633
+#, python-format
+msgid "Floating ip not found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:637
+#, python-format
+msgid "Floating ip not found for host %(host)s."
+msgstr ""
+
+#: nova/exception.py:641
+#, python-format
+msgid "Multiple floating ips are found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:645
+msgid "Floating ip pool not found."
+msgstr ""
+
+#: nova/exception.py:650
+msgid "Zero floating ips available."
+msgstr ""
+
+#: nova/exception.py:655
+#, python-format
+msgid "Floating ip %(address)s is associated."
+msgstr ""
+
+#: nova/exception.py:659
+#, python-format
+msgid "Floating ip %(address)s is not associated."
+msgstr ""
+
+#: nova/exception.py:663
+msgid "Zero floating ips exist."
+msgstr ""
+
+#: nova/exception.py:667
+#, python-format
+msgid "Interface %(interface)s not found."
+msgstr ""
+
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
+msgstr ""
+
+#: nova/exception.py:675
+#, python-format
+msgid "Keypair %(name)s not found for user %(user_id)s"
+msgstr ""
+
+#: nova/exception.py:679
+#, python-format
+msgid "Service %(service_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:683
+#, python-format
+msgid "Host %(host)s could not be found."
+msgstr ""
+
+#: nova/exception.py:687
+#, python-format
+msgid "Compute host %(host)s could not be found."
+msgstr ""
+
+#: nova/exception.py:691
+#, python-format
+msgid "Could not find binary %(binary)s on host %(host)s."
+msgstr ""
+
+#: nova/exception.py:695
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
+#: nova/exception.py:699
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:704
+msgid "Quota could not be found"
+msgstr ""
+
+#: nova/exception.py:708
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:712
+#, python-format
+msgid "Quota for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:716
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:720
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:724
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:728
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:732
+#, python-format
+msgid "Security group %(security_group_id)s not found."
+msgstr ""
+
+#: nova/exception.py:736
+#, python-format
+msgid "Security group %(security_group_id)s not found for project %(project_id)s."
+msgstr ""
+
+#: nova/exception.py:741
+#, python-format
+msgid "Security group with rule %(rule_id)s not found."
+msgstr ""
+
+#: nova/exception.py:745
+#, python-format
+msgid ""
+"Security group %(security_group_id)s is already associated with the "
+"instance %(instance_id)s"
+msgstr ""
+
+#: nova/exception.py:750
+#, python-format
+msgid ""
+"Security group %(security_group_id)s is not associated with the instance "
+"%(instance_id)s"
+msgstr ""
+
+#: nova/exception.py:755
+#, python-format
+msgid "Security group default rule (%rule_id)s not found."
+msgstr ""
+
+#: nova/exception.py:759
+msgid ""
+"Network requires port_security_enabled and subnet associated in order to "
+"apply security groups."
+msgstr ""
+
+#: nova/exception.py:764
+msgid "No Unique Match Found."
+msgstr ""
+
+#: nova/exception.py:769
+#, python-format
+msgid "Migration %(migration_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:773
+#, python-format
+msgid "Migration not found for instance %(instance_id)s with status %(status)s."
+msgstr ""
+
+#: nova/exception.py:778
+#, python-format
+msgid "Console pool %(pool_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:782
+#, python-format
+msgid ""
+"Console pool of type %(console_type)s for compute host %(compute_host)s "
+"on proxy host %(host)s not found."
+msgstr ""
+
+#: nova/exception.py:788
+#, python-format
+msgid "Console %(console_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:792
+#, python-format
+msgid "Console for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:796
+#, python-format
+msgid ""
+"Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
+"found."
+msgstr ""
+
+#: nova/exception.py:801
+#, python-format
+msgid "Invalid console type %(console_type)s"
+msgstr ""
+
+#: nova/exception.py:805
+#, python-format
+msgid "Instance type %(instance_type_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:809
+#, python-format
+msgid "Instance type with name %(instance_type_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:814
+#, python-format
+msgid "Flavor %(flavor_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:818
+#, python-format
+msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
+msgstr ""
+
+#: nova/exception.py:823
+#, python-format
+msgid "Cell %(cell_name)s doesn't exist."
+msgstr ""
+
+#: nova/exception.py:827
+#, python-format
+msgid "Cell with name %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:831
+#, python-format
+msgid "Inconsistency in cell routing: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:835
+#, python-format
+msgid "Service API method not found: %(detail)s"
+msgstr ""
+
+#: nova/exception.py:839
+msgid "Timeout waiting for response from cell"
+msgstr ""
+
+#: nova/exception.py:843
+#, python-format
+msgid "Cell message has reached maximum hop count: %(hop_count)s"
+msgstr ""
+
+#: nova/exception.py:847
+msgid "No cells available matching scheduling criteria."
+msgstr ""
+
+#: nova/exception.py:851
+#, python-format
+msgid "Exception received during cell processing: %(exc_name)s."
+msgstr ""
+
+#: nova/exception.py:855
+#, python-format
+msgid "Cell is not known for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/exception.py:859
+#, python-format
+msgid "Scheduler Host Filter %(filter_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:863
+#, python-format
+msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:868
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:873
+#, python-format
+msgid ""
+"Instance Type %(instance_type_id)s has no extra specs with key "
+"%(extra_specs_key)s."
+msgstr ""
+
+#: nova/exception.py:878
+#, python-format
+msgid "File %(file_path)s could not be found."
+msgstr ""
+
+#: nova/exception.py:882
+msgid "Zero files could be found."
+msgstr ""
+
+#: nova/exception.py:886
+#, python-format
+msgid "Virtual switch associated with the network adapter %(adapter)s not found."
+msgstr ""
+
+#: nova/exception.py:891
+#, python-format
+msgid "Network adapter %(adapter)s could not be found."
+msgstr ""
+
+#: nova/exception.py:895
+#, python-format
+msgid "Class %(class_name)s could not be found: %(exception)s"
+msgstr ""
+
+#: nova/exception.py:899
+msgid "Action not allowed."
+msgstr ""
+
+#: nova/exception.py:903
+msgid "Rotation is not allowed for snapshots"
+msgstr ""
+
+#: nova/exception.py:907
+msgid "Rotation param is required for backup image_type"
+msgstr ""
+
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
+#, python-format
+msgid "Key pair '%(key_name)s' already exists."
+msgstr ""
+
+#: nova/exception.py:915
+#, python-format
+msgid "Instance %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:919
+#, python-format
+msgid "Instance Type with name %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:923
+#, python-format
+msgid "Instance Type with ID %(flavor_id)s already exists."
+msgstr ""
+
+#: nova/exception.py:927
+#, python-format
+msgid ""
+"Flavor access already exists for flavor %(flavor_id)s and project "
+"%(project_id)s combination."
+msgstr ""
+
+#: nova/exception.py:932
+#, python-format
+msgid "%(path)s is not on shared storage: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:936
+#, python-format
+msgid "%(path)s is not on local storage: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:940
+msgid "Migration error"
+msgstr ""
+
+#: nova/exception.py:944
+msgid "Migration pre-check error"
+msgstr ""
+
+#: nova/exception.py:948
+#, python-format
+msgid "Malformed message body: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:954
+#, python-format
+msgid "Could not find config at %(path)s"
+msgstr ""
+
+#: nova/exception.py:958
+#, python-format
+msgid "Could not load paste app '%(name)s' from %(path)s"
+msgstr ""
+
+#: nova/exception.py:962
+msgid "When resizing, instances must change flavor!"
+msgstr ""
+
+#: nova/exception.py:966
+#, python-format
+msgid "Resize error: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:970
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:974
+msgid "Instance type's memory is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:978
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:982
+#, python-format
+msgid "Insufficient free memory on compute node to start %(uuid)s."
+msgstr ""
+
+#: nova/exception.py:986
+msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
+msgstr ""
+
+#: nova/exception.py:990
+#, python-format
+msgid "No valid host was found. %(reason)s"
+msgstr ""
+
+#: nova/exception.py:994
+msgid "Quota exceeded"
+msgstr ""
+
+#: nova/exception.py:1001
+#, python-format
+msgid ""
+"Quota exceeded for %(overs)s: Requested %(req)s, but already used "
+"%(used)d of %(allowed)d %(resource)s"
+msgstr ""
+
+#: nova/exception.py:1006
+msgid "Maximum number of floating ips exceeded"
+msgstr ""
+
+#: nova/exception.py:1010
+msgid "Maximum number of fixed ips exceeded"
+msgstr ""
+
+#: nova/exception.py:1014
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:1018
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:1026
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1034
+msgid "Maximum number of security groups or rules exceeded"
+msgstr ""
+
+#: nova/exception.py:1038
+#, python-format
+msgid ""
+"Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
+"%(reason)s."
+msgstr ""
+
+#: nova/exception.py:1043
+#, python-format
+msgid "Aggregate %(aggregate_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1047
+#, python-format
+msgid "Aggregate %(aggregate_name)s already exists."
+msgstr ""
+
+#: nova/exception.py:1051
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no host %(host)s."
+msgstr ""
+
+#: nova/exception.py:1055
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:1060
+#, python-format
+msgid "Aggregate %(aggregate_id)s already has host %(host)s."
+msgstr ""
+
+#: nova/exception.py:1064
+msgid "Unable to create instance type"
+msgstr ""
+
+#: nova/exception.py:1068
+#, python-format
+msgid "Failed to set admin password on %(instance)s because %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1074
+#, python-format
+msgid "Detected existing vlan with id %(vlan)d"
+msgstr ""
+
+#: nova/exception.py:1078
+msgid "There was a conflict when trying to complete your request."
+msgstr ""
+
+#: nova/exception.py:1083
+#, python-format
+msgid "Instance %(instance_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1087
+#, python-format
+msgid "Info cache for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1092
+#, python-format
+msgid "Node %(node_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1096
+#, python-format
+msgid "Node with UUID %(node_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1100
+#, python-format
+msgid "Marker %(marker)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1104
+#, python-format
+msgid "Invalid id: %(val)s (expecting \"i-...\")."
+msgstr ""
+
+#: nova/exception.py:1108
+#, python-format
+msgid "Could not fetch image %(image_id)s"
+msgstr ""
+
+#: nova/exception.py:1112
+#, python-format
+msgid "Could not upload image %(image_id)s"
+msgstr ""
+
+#: nova/exception.py:1116
+#, python-format
+msgid "Task %(task_name)s is already running on host %(host)s"
+msgstr ""
+
+#: nova/exception.py:1120
+#, python-format
+msgid "Task %(task_name)s is not running on host %(host)s"
+msgstr ""
+
+#: nova/exception.py:1124
+#, python-format
+msgid "Instance %(instance_uuid)s is locked"
+msgstr ""
+
+#: nova/exception.py:1128
+#, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
+msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
+msgstr ""
+
+#: nova/exception.py:1137
+#, python-format
+msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
+msgstr ""
+
+#: nova/exception.py:1142
+#, python-format
+msgid "Failed to attach network adapter device to %(instance)s"
+msgstr ""
+
+#: nova/exception.py:1146
+#, python-format
+msgid "Failed to detach network adapter device from  %(instance)s"
+msgstr ""
+
+#: nova/exception.py:1150
+#, python-format
+msgid ""
+"User data too large. User data must be no larger than %(maxsize)s bytes "
+"once base64 encoded. Your data is %(length)d bytes"
+msgstr ""
+
+#: nova/exception.py:1156
+msgid "User data needs to be valid base 64."
+msgstr ""
+
+#: nova/exception.py:1160
+#, python-format
+msgid ""
+"unexpected task state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1165
+#, python-format
+msgid ""
+"Action for request_id %(request_id)s on instance %(instance_uuid)s not "
+"found"
+msgstr ""
+
+#: nova/exception.py:1170
+#, python-format
+msgid "Event %(event)s not found for action id %(action_id)s"
+msgstr ""
+
+#: nova/exception.py:1174
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1179
+#, python-format
+msgid "The CA file for %(project)s could not be found"
+msgstr ""
+
+#: nova/exception.py:1183
+#, python-format
+msgid "The CRL file for %(project)s could not be found"
+msgstr ""
+
+#: nova/exception.py:1187
+msgid "Instance recreate is not implemented by this virt driver."
+msgstr ""
+
+#: nova/exception.py:1191
+#, python-format
+msgid ""
+"The service from servicegroup driver %(driver)s is temporarily "
+"unavailable."
+msgstr ""
+
+#: nova/exception.py:1196
+#, python-format
+msgid "%(binary)s attempted direct database access which is not allowed by policy"
+msgstr ""
+
+#: nova/exception.py:1201
+#, python-format
+msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
+msgstr ""
+
+#: nova/exception.py:1206
+#, python-format
+msgid ""
+"Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
+"driver"
+msgstr ""
+
+#: nova/exception.py:1211
+#, python-format
+msgid "Invalid Base 64 data for file %(path)s"
+msgstr ""
+
+#: nova/exception.py:1215
+#, python-format
+msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1219
+#, python-format
+msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1224
+#, python-format
+msgid "Shadow table with name %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:1229
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
+#: nova/exception.py:1235
+#, python-format
+msgid "Unsupported object type %(objtype)s"
+msgstr ""
+
+#: nova/exception.py:1239
+#, python-format
+msgid "Cannot call %(method)s on orphaned %(objtype)s object"
+msgstr ""
+
+#: nova/exception.py:1243
+#, python-format
+msgid "Version %(objver)s of %(objname)s is not supported"
+msgstr ""
+
+#: nova/exception.py:1247
+#, python-format
+msgid "Core API extensions are missing: %(missing_apis)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1255
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1264
+#, python-format
+msgid "Instance group %(group_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1268
+#, python-format
+msgid "Instance group %(group_uuid)s already exists."
+msgstr ""
+
+#: nova/exception.py:1272
+#, python-format
+msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:1277
+#, python-format
+msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
+msgstr ""
+
+#: nova/exception.py:1282
+#, python-format
+msgid "Instance group %(group_uuid)s has no policy %(policy)s."
+msgstr ""
+
+#: nova/hooks.py:62
+#, python-format
+msgid "Running %(name)s pre-hook: %(obj)s"
+msgstr ""
+
+#: nova/hooks.py:70
+#, python-format
+msgid "Running %(name)s post-hook: %(obj)s"
+msgstr ""
+
+#: nova/manager.py:162
+msgid "Notifying Schedulers of capabilities ..."
+msgstr ""
+
+#: nova/notifications.py:116 nova/notifications.py:156
+msgid "Failed to send state update notification"
+msgstr ""
+
+#: nova/notifications.py:241
+msgid "Failed to get nw_info"
+msgstr ""
+
+#: nova/policy.py:32
+msgid "JSON file representing policy"
+msgstr ""
+
+#: nova/policy.py:35
+msgid "Rule checked when requested rule is not found"
+msgstr ""
+
+#: nova/quota.py:972
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:994
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:997
+#, python-format
+msgid "Committed reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:1017
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:1020
+#, python-format
+msgid "Rolled back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:153
+#, python-format
+msgid "Starting %(topic)s node (version %(version)s)"
+msgstr ""
+
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
+#, python-format
+msgid "Creating Consumer connection for Service %s"
+msgstr ""
+
+#: nova/service.py:190
+#, python-format
+msgid "Join ServiceGroup membership for this service %s"
+msgstr ""
+
+#: nova/service.py:270
+msgid "Service killed that has no database entry"
+msgstr ""
+
+#: nova/service.py:292
+#, python-format
+msgid "Temporary directory is invalid: %s"
+msgstr ""
+
+#: nova/service.py:394
+msgid "serve() can only be called once"
+msgstr ""
+
+#: nova/utils.py:150
+#, python-format
+msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
+msgstr ""
+
+#: nova/utils.py:178
+#, python-format
+msgid "debug in callback: %s"
+msgstr ""
+
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
+#, python-format
+msgid "Link Local address is not found.:%s"
+msgstr ""
+
+#: nova/utils.py:400
+#, python-format
+msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgstr ""
+
+#: nova/utils.py:439
+#, python-format
+msgid "Invalid backend: %s"
+msgstr ""
+
+#: nova/utils.py:589
+#, python-format
+msgid "Expected object of type: %s"
+msgstr ""
+
+#: nova/utils.py:618
+#, python-format
+msgid "Invalid server_string: %s"
+msgstr ""
+
+#: nova/utils.py:760
+#, python-format
+msgid "timefunc: '%(name)s' took %(total_time).2f secs"
+msgstr ""
+
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
+#, python-format
+msgid "Reloading cached file %s"
+msgstr ""
+
+#: nova/utils.py:936 nova/virt/configdrive.py:177
+#, python-format
+msgid "Could not remove tmpdir: %s"
+msgstr ""
+
+#: nova/utils.py:1103
+#, python-format
+msgid "%s is not a string or unicode"
+msgstr ""
+
+#: nova/utils.py:1107
+#, python-format
+msgid "%(name)s has less than %(min_length)s characters."
+msgstr ""
+
+#: nova/utils.py:1112
+#, python-format
+msgid "%(name)s has more than %(max_length)s characters."
+msgstr ""
+
+#: nova/wsgi.py:125
+#, python-format
+msgid "%(name)s listening on %(host)s:%(port)s"
+msgstr ""
+
+#: nova/wsgi.py:140
+#, python-format
+msgid "Unable to find cert_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:144
+#, python-format
+msgid "Unable to find ca_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:148
+#, python-format
+msgid "Unable to find key_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:152
+msgid ""
+"When running server in SSL mode, you must specify both a cert_file and "
+"key_file option value in your configuration file"
+msgstr ""
+
+#: nova/wsgi.py:183
+#, python-format
+msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
+msgstr ""
+
+#: nova/wsgi.py:210
+msgid "Stopping WSGI server."
+msgstr ""
+
+#: nova/wsgi.py:228
+msgid "WSGI server has stopped."
+msgstr ""
+
+#: nova/wsgi.py:297
+msgid "You must implement __call__"
+msgstr ""
+
+#: nova/wsgi.py:483
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
+#: nova/api/auth.py:116
+msgid "Invalid service catalog json."
+msgstr ""
+
+#: nova/api/auth.py:139
+msgid "Sourcing roles from deprecated X-Role HTTP header"
+msgstr ""
+
+#: nova/api/sizelimit.py:53 nova/api/sizelimit.py:62 nova/api/sizelimit.py:76
+#: nova/api/metadata/password.py:61
+msgid "Request is too large."
+msgstr ""
+
+#: nova/api/validator.py:131
+#, python-format
+msgid "%(key)s with value %(value)s failed validator %(name)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:81
+#, python-format
+msgid "%(code)s: %(message)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:104
+#, python-format
+msgid "FaultWrapper: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:175
+msgid "Too many failed authentications."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:184
+#, python-format
+msgid ""
+"Access key %(access_key)s has had %(failures)d failed authentications and"
+" will be locked out for %(lock_mins)d minutes."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:203
+msgid "Signature not provided"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:207
+msgid "Access key not provided"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
+msgid "Failure communicating with keystone"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:256
+#, python-format
+msgid "Keystone failure: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:316
+msgid "Timestamp failed validation."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:336
+#, python-format
+msgid "action: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:338
+#, python-format
+msgid "arg: %(key)s\t\tval: %(value)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:414
+#, python-format
+msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:488
+#, python-format
+msgid "InstanceNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:494
+#, python-format
+msgid "VolumeNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:500
+#, python-format
+msgid "SnapshotNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:506
+#, python-format
+msgid "NotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:515
+#, python-format
+msgid "KeyPairExists raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:520
+#, python-format
+msgid "InvalidKeypair raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:525
+#, python-format
+msgid "InvalidParameterValue raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:529
+#, python-format
+msgid "InvalidPortRange raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:533
+#, python-format
+msgid "NotAuthorized raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:537
+#, python-format
+msgid "InvalidRequest raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:541
+#, python-format
+msgid "QuotaError raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:545
+#, python-format
+msgid "Invalid id: bogus (expecting \"i-...\"): %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:554
+#, python-format
+msgid "Unexpected error raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:555
+#, python-format
+msgid "Environment: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
+msgid "An unknown error has occurred. Please try your request again."
+msgstr ""
+
+#: nova/api/ec2/apirequest.py:61
+#, python-format
+msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:401
+#, python-format
+msgid "Create snapshot of volume %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:426
+#, python-format
+msgid "Could not find key pair(s): %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:443
+#, python-format
+msgid "Create key pair %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
+#: nova/api/openstack/compute/contrib/keypairs.py:93
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:459
+#, python-format
+msgid "Import key %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:479
+#, python-format
+msgid "Delete key pair %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:626
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:633
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
+msgid "No rule for the specified parameters."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:686
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:769
+#, python-format
+msgid "Get console output for instance %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:840
+#, python-format
+msgid "Create volume from snapshot %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
+#, python-format
+msgid "Create volume of %s GB"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:871
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:884
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:895
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
+#, python-format
+msgid "Detach volume %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:924
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
+#, python-format
+msgid "attribute not supported: %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1082
+#, python-format
+msgid "vol = %s\n"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1242
+msgid "Allocate address"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1246
+msgid "No more floating IPs available"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1250
+#, python-format
+msgid "Release address %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1255
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1258
+#, python-format
+msgid "Associate address %(public_ip)s to instance %(instance_id)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1268
+msgid "Unable to associate IP Address, no fixed_ips."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1276
+#: nova/api/openstack/compute/contrib/floating_ips.py:248
+#, python-format
+msgid "multiple fixed_ips exist, using the first: %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1285
+msgid "Floating ip is already associated."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1288
+msgid "l3driver call to add floating ip failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1291
+msgid "Error, unable to associate floating ip."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1299
+#, python-format
+msgid "Disassociate address %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1304
+msgid "Floating ip is not associated."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1334
+msgid "Image must be available"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1372
+msgid "Going to start terminating instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1382
+#, python-format
+msgid "Reboot instance %r"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1392
+msgid "Going to stop instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1402
+msgid "Going to start instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1493
+#, python-format
+msgid "De-registering image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1509
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1528
+#, python-format
+msgid "Registered image %(image_location)s with id %(image_id)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1591
+msgid "user or group not specified"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1593
+msgid "only group \"all\" is supported"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1595
+msgid "operation_type must be add or remove"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1597
+#, python-format
+msgid "Updating image %s publicity"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1610
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1638
+#, python-format
+msgid ""
+"Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
+"have a volume attached at root (%(root)s)"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1670
+#, python-format
+msgid "Couldn't stop instance with in %d sec"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1688
+#, python-format
+msgid "image of %(instance)s at %(now)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
+msgid "resource_id and tag are required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+msgid "Expecting a list of resources"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
+msgid "Only instances implemented"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+msgid "Expecting a list of tagSets"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1780
+msgid "Expecting key to be set"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1853
+msgid "Invalid CIDR"
+msgstr ""
+
+#: nova/api/ec2/ec2utils.py:249
+msgid "Request must include either Timestamp or Expires, but cannot contain both"
+msgstr ""
+
+#: nova/api/ec2/ec2utils.py:267
+msgid "Timestamp is invalid."
+msgstr ""
+
+#: nova/api/metadata/handler.py:108
+msgid ""
+"X-Instance-ID present in request headers. The "
+"'service_quantum_metadata_proxy' option must be enabled to process this "
+"header."
+msgstr ""
+
+#: nova/api/metadata/handler.py:134 nova/api/metadata/handler.py:141
+#, python-format
+msgid "Failed to get metadata for ip: %s"
+msgstr ""
+
+#: nova/api/metadata/handler.py:153
+msgid "X-Instance-ID header is missing from request."
+msgstr ""
+
+#: nova/api/metadata/handler.py:155
+msgid "Multiple X-Instance-ID headers found within request."
+msgstr ""
+
+#: nova/api/metadata/handler.py:169
+#, python-format
+msgid ""
+"X-Instance-ID-Signature: %(signature)s does not match the expected value:"
+" %(expected_signature)s for id: %(instance_id)s.  Request From: "
+"%(remote_address)s"
+msgstr ""
+
+#: nova/api/metadata/handler.py:178
+msgid "Invalid proxy request signature."
+msgstr ""
+
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
+#, python-format
+msgid "Failed to get metadata for instance id: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:79
+#, python-format
+msgid "Caught error: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:88
+#, python-format
+msgid "%(url)s returned with HTTP %(status)d"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:175
+msgid "Must specify an ExtensionManager class"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:186 nova/api/openstack/__init__.py:349
+#, python-format
+msgid "Extended resource: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:221 nova/api/openstack/__init__.py:396
+#, python-format
+msgid ""
+"Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
+"resource"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:226 nova/api/openstack/__init__.py:401
+#, python-format
+msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:269
+#, python-format
+msgid "Not loading %s because it is in the blacklist"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:274
+#, python-format
+msgid "Not loading %s because it is not in the whitelist"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:285
+#, python-format
+msgid "v3 API Extension Blacklist: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:287
+#, python-format
+msgid "v3 API Extension Whitelist: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:294
+#, python-format
+msgid "Extensions in both blacklist and whitelist: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:318
+#, python-format
+msgid "Missing core API extensions: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:346
+#, python-format
+msgid "Running _register_resources on %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:388
+#, python-format
+msgid "Running _register_controllers on %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:114
+#, python-format
+msgid ""
+"status is UNKNOWN from vm_state=%(vm_state)s task_state=%(task_state)s. "
+"Bad upgrade or db corrupted?"
+msgstr ""
+
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
+msgid "limit param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
+msgid "limit param must be positive"
+msgstr ""
+
+#: nova/api/openstack/common.py:182
+msgid "offset param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:196
+msgid "offset param must be positive"
+msgstr ""
+
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/plugins/v3/servers.py:598
+#, python-format
+msgid "marker [%s] not found"
+msgstr ""
+
+#: nova/api/openstack/common.py:271
+#, python-format
+msgid "href %s does not contain version"
+msgstr ""
+
+#: nova/api/openstack/common.py:286
+msgid "Image metadata limit exceeded"
+msgstr ""
+
+#: nova/api/openstack/common.py:294
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:297
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:300
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:363
+#, python-format
+msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:366
+#, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
+msgid "Instance is in an invalid state for '%s'"
+msgstr ""
+
+#: nova/api/openstack/common.py:449
+msgid "Rejecting snapshot request, snapshots currently disabled"
+msgstr ""
+
+#: nova/api/openstack/common.py:451
+msgid "Instance snapshots are not permitted at this time."
+msgstr ""
+
+#: nova/api/openstack/extensions.py:197
+#, python-format
+msgid "Loaded extension: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/compute/plugins/__init__.py:46
+#, python-format
+msgid "Ext name: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/compute/plugins/__init__.py:47
+#, python-format
+msgid "Ext alias: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:238
+#: nova/api/openstack/compute/plugins/__init__.py:48
+#, python-format
+msgid "Ext description: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/compute/plugins/__init__.py:50
+#, python-format
+msgid "Ext namespace: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:241
+#, python-format
+msgid "Ext updated: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:243
+#: nova/api/openstack/compute/plugins/__init__.py:53
+#, python-format
+msgid "Exception loading extension: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:257
+#, python-format
+msgid "Loading extension %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:266
+#, python-format
+msgid "Calling extension factory %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:278
+#, python-format
+msgid "Failed to load extension %(ext_factory)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:349
+#, python-format
+msgid "Failed to load extension %(classpath)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:372
+#, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
+msgid "cannot understand JSON"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:631
+msgid "too many body keys"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:675
+#, python-format
+msgid "Exception handling resource: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:679
+#, python-format
+msgid "Fault thrown: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:682
+#, python-format
+msgid "HTTP exception thrown: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:796
+msgid "Unrecognized Content-Type provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:800
+msgid "No Content-Type provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:804
+msgid "Empty body provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:912
+#, python-format
+msgid "There is no such action: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:935
+#: nova/api/openstack/compute/server_metadata.py:58
+#: nova/api/openstack/compute/server_metadata.py:76
+#: nova/api/openstack/compute/server_metadata.py:101
+#: nova/api/openstack/compute/server_metadata.py:126
+#: nova/api/openstack/compute/contrib/admin_actions.py:211
+#: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
+msgid "Malformed request body"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:919
+#, python-format
+msgid "Action: '%(action)s', body: %(body)s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:923
+#, python-format
+msgid "Calling method %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:932
+msgid "Unsupported Content-Type"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:944
+#, python-format
+msgid ""
+"Malformed request URL: URL's project_id '%(project_id)s' doesn't match "
+"Context's project_id '%(context_project_id)s'"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:1181
+#, python-format
+msgid "Returning %(code)s to user: %(explanation)s"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:270
+msgid "element is not a child"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:419
+msgid "root element selecting a list"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:742
+#, python-format
+msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:862
+msgid "subclasses must implement construct()!"
+msgstr ""
+
+#: nova/api/openstack/compute/extensions.py:38
+msgid "Initializing extension manager."
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
+#, python-format
+msgid "Invalid is_public filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:36
+#: nova/api/openstack/compute/images.py:141
+#: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
+msgid "Image not found."
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:76
+msgid "Incorrect request body format"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:80
+#: nova/api/openstack/compute/server_metadata.py:80
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:85
+msgid "Request body and URI mismatch"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/server_metadata.py:84
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:88
+msgid "Request body contains too many items"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:109
+msgid "Invalid metadata key"
+msgstr ""
+
+#: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
+msgid "You are not allowed to delete the image."
+msgstr ""
+
+#: nova/api/openstack/compute/ips.py:68
+#: nova/api/openstack/compute/plugins/v3/ips.py:69
+msgid "Instance does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/ips.py:91
+#: nova/api/openstack/compute/plugins/v3/ips.py:92
+msgid "Instance is not a member of specified network"
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:148
+#, python-format
+msgid ""
+"Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
+"%(unit_string)s."
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:276
+msgid "This request was rate-limited."
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:38
+#: nova/api/openstack/compute/server_metadata.py:122
+#: nova/api/openstack/compute/server_metadata.py:173
+msgid "Server does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:154
+#: nova/api/openstack/compute/server_metadata.py:165
+msgid "Metadata item was not found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:521
+#: nova/api/openstack/compute/contrib/cells.py:317
+#: nova/api/openstack/compute/plugins/v3/servers.py:563
+msgid "Invalid changes-since value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/plugins/v3/servers.py:582
+msgid "Only administrators may list deleted instances"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:559
+#: nova/api/openstack/compute/plugins/v3/servers.py:601
+#, python-format
+msgid "Flavor '%s' could not be found "
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
+#: nova/api/openstack/compute/plugins/v3/servers.py:618
+#: nova/api/openstack/compute/plugins/v3/servers.py:785
+#: nova/api/openstack/compute/plugins/v3/servers.py:1090
+#: nova/api/openstack/compute/plugins/v3/servers.py:1198
+#: nova/api/openstack/compute/plugins/v3/servers.py:1377
+msgid "Instance could not be found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:597
+#: nova/api/openstack/compute/plugins/v3/servers.py:637
+msgid "Device name cannot include spaces."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:614
+#: nova/api/openstack/compute/plugins/v3/servers.py:654
+#, python-format
+msgid "Bad personality format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:617
+#: nova/api/openstack/compute/plugins/v3/servers.py:657
+msgid "Bad personality format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:620
+#: nova/api/openstack/compute/plugins/v3/servers.py:660
+#, python-format
+msgid "Personality content for %s cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:651
+#: nova/api/openstack/compute/plugins/v3/servers.py:691
+msgid "Unknown argment : port"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:654
+#: nova/api/openstack/compute/plugins/v3/servers.py:694
+#, python-format
+msgid "Bad port format: port uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:664
+#: nova/api/openstack/compute/plugins/v3/servers.py:704
+#, python-format
+msgid "Bad networks format: network uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:674
+#: nova/api/openstack/compute/plugins/v3/servers.py:714
+#, python-format
+msgid "Invalid fixed IP address (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:687
+#: nova/api/openstack/compute/plugins/v3/servers.py:727
+#, python-format
+msgid "Duplicate networks (%s) are not allowed"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:693
+#: nova/api/openstack/compute/plugins/v3/servers.py:733
+#, python-format
+msgid "Bad network format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:696
+#: nova/api/openstack/compute/servers.py:797
+#: nova/api/openstack/compute/plugins/v3/servers.py:736
+msgid "Bad networks format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:722
+#: nova/api/openstack/compute/plugins/v3/servers.py:762
+msgid "Userdata content cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/plugins/v3/servers.py:767
+msgid "accessIPv4 is not proper IPv4 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:732
+#: nova/api/openstack/compute/plugins/v3/servers.py:772
+msgid "accessIPv6 is not proper IPv6 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:761
+#: nova/api/openstack/compute/plugins/v3/servers.py:801
+msgid "Server name is not defined"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:813
+#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/plugins/v3/servers.py:876
+#: nova/api/openstack/compute/plugins/v3/servers.py:993
+msgid "Invalid flavorRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:854
+#: nova/api/openstack/compute/plugins/v3/servers.py:924
+msgid "min_count must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/plugins/v3/servers.py:927
+msgid "min_count must be > 0"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/plugins/v3/servers.py:933
+msgid "max_count must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:866
+#: nova/api/openstack/compute/plugins/v3/servers.py:936
+msgid "max_count must be > 0"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/plugins/v3/servers.py:940
+msgid "min_count must be <= max_count"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/plugins/v3/servers.py:990
+msgid "Can not find requested image"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:920
+#: nova/api/openstack/compute/plugins/v3/servers.py:996
+msgid "Invalid key_name provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/plugins/v3/servers.py:1078
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/plugins/v3/servers.py:1082
+msgid "Personality cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/plugins/v3/servers.py:1108
+#: nova/api/openstack/compute/plugins/v3/servers.py:1125
+msgid "Instance has not been resized."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+msgid "Flavor used by the instance could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/plugins/v3/servers.py:1144
+msgid "Argument 'type' for reboot is not HARD or SOFT"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/plugins/v3/servers.py:1148
+msgid "Missing argument 'type' for reboot"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/plugins/v3/servers.py:1170
+msgid "Unable to locate requested flavor."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/plugins/v3/servers.py:1173
+msgid "Resize requires a flavor change."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/plugins/v3/servers.py:1179
+msgid "You are not authorized to access the image the instance was started with."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1104
+#: nova/api/openstack/compute/plugins/v3/servers.py:1183
+msgid "Image that the instance was started with could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
+msgid "Invalid instance image."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1129
+#: nova/api/openstack/compute/plugins/v3/servers.py:1208
+msgid "Missing imageRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/plugins/v3/servers.py:1217
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1165
+#: nova/api/openstack/compute/plugins/v3/servers.py:1250
+msgid "Missing flavorRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1178
+#: nova/api/openstack/compute/plugins/v3/servers.py:1263
+msgid "No adminPass was specified"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
+#: nova/api/openstack/compute/plugins/v3/servers.py:1267
+#: nova/api/openstack/compute/plugins/v3/servers.py:1476
+msgid "Invalid adminPass"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1188
+#: nova/api/openstack/compute/plugins/v3/servers.py:1273
+msgid "Unable to set password on instance"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1197
+#: nova/api/openstack/compute/plugins/v3/servers.py:1282
+msgid "Unable to parse metadata key/value pairs."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/plugins/v3/servers.py:1295
+msgid "Resize request has invalid 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1213
+#: nova/api/openstack/compute/plugins/v3/servers.py:1298
+msgid "Resize requests require 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1231
+#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
+#: nova/api/openstack/compute/contrib/keypairs.py:78
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
+#: nova/api/openstack/compute/plugins/v3/servers.py:1316
+msgid "Invalid request body"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1237
+#: nova/api/openstack/compute/plugins/v3/servers.py:1322
+msgid "Could not parse imageRef from request."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1298
+#: nova/api/openstack/compute/plugins/v3/servers.py:1383
+msgid "Cannot find image for rebuild"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/plugins/v3/servers.py:1417
+msgid "createImage entity requires name attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1417
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
+#, python-format
+msgid "Removing options '%s' from query"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:60
+#, python-format
+msgid "Compute.api::pause %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:77
+#, python-format
+msgid "Compute.api::unpause %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:94
+#, python-format
+msgid "compute.api::suspend %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:111
+#, python-format
+msgid "compute.api::resume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:127
+#, python-format
+msgid "Error in migrate %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:141
+#, python-format
+msgid "Compute.api::reset_network %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:154
+#: nova/api/openstack/compute/contrib/admin_actions.py:170
+#: nova/api/openstack/compute/contrib/admin_actions.py:186
+#: nova/api/openstack/compute/contrib/admin_actions.py:321
+#: nova/api/openstack/compute/contrib/multinic.py:41
+#: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
+msgid "Server not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:157
+#, python-format
+msgid "Compute.api::inject_network_info %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:173
+#, python-format
+msgid "Compute.api::lock %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:189
+#, python-format
+msgid "Compute.api::unlock %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:219
+#, python-format
+msgid "createBackup entity requires %s attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:223
+msgid "Malformed createBackup entity"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:229
+msgid "createBackup attribute 'rotation' must be an integer"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:232
+msgid "createBackup attribute 'rotation' must be greater than or equal to zero"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:248
+#: nova/api/openstack/compute/contrib/console_output.py:45
+#: nova/api/openstack/compute/contrib/server_diagnostics.py:47
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
+msgid "Instance not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:278
+msgid "host and block_migration must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:292
+#, python-format
+msgid "Live migration of instance %s to another host failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:295
+#, python-format
+msgid "Live migration of instance %(id)s to host %(host)s failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:313
+#, python-format
+msgid "Desired state must be specified.  Valid states are: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:324
+#, python-format
+msgid "Compute.api::resetState %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:89
+#, python-format
+msgid "Cannot show aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:115
+#, python-format
+msgid "Cannot update aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:127
+#, python-format
+msgid "Cannot delete aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:140
+#, python-format
+msgid "Aggregates does not have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:153
+#: nova/api/openstack/compute/contrib/aggregates.py:158
+#, python-format
+msgid "Cannot add host %(host)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:172
+#: nova/api/openstack/compute/contrib/aggregates.py:176
+#, python-format
+msgid "Cannot remove host %(host)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:196
+#, python-format
+msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:102
+msgid "Attach interface"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:109
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:142
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:165
+msgid "Network driver does not support this function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:113
+msgid "Failed to attach interface"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:121
+msgid "Attachments update is not supported"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:132
+#, python-format
+msgid "Detach interface %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
+msgid "Must specify id or address"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:210
+#, python-format
+msgid "Cell %(id)s not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:238
+msgid "Cell name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:242
+msgid "Cell name cannot contain '!' or '.'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:249
+msgid "Cell type must be 'parent' or 'child'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:269
+#: nova/api/openstack/compute/contrib/cells.py:289
+msgid "No cell information in request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:274
+msgid "No cell name in request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:311
+msgid "Only 'updated_since' and 'project_id' are understood."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
+msgid "Only root certificate can be retrieved."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cloudpipe.py:149
+msgid ""
+"Unable to claim IP for VPN instances, ensure it isn't running, and try "
+"again in a few minutes"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cloudpipe_update.py:41
+#, python-format
+msgid "Unknown action %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:50
+msgid "os-getConsoleOutput malformed or missing from request body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:57
+msgid "Length in request body must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:65
+msgid "Unable to get console"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/consoles.py:51
+msgid "Instance not yet ready"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:97
+#, python-format
+msgid "Can't connect to service: %s, no portspecified\n"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:116
+msgid "Coverage begin"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
+msgid "Coverage not running"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
+msgid "Invalid path"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
+msgid "No path given for report file"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
+msgid "You can't use html reports without combining"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
+#, python-format
+msgid "Directory conflict: %s already exists"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
+msgid "Python coverage module is not installed."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
+#, python-format
+msgid "Coverage doesn't have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/disk_config.py:43
+#, python-format
+msgid "%s must be either 'MANUAL' or 'AUTO'."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
+msgid "admin password can't be changed on existing disk"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
+msgid "host and onSharedStorage must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
+#, python-format
+msgid "Error in evacuate, %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fixed_ips.py:40
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
+#, python-format
+msgid "Fixed IP %s has been deleted"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
+#, python-format
+msgid "Fixed IP %s not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:76
+#: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
+msgid "Flavor not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
+msgid "Access list not available for public flavors."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
+msgid "No request body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:55
+msgid "No Request Body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ip_dns.py:223
+msgid "DNS entries not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:129
+#: nova/api/openstack/compute/contrib/floating_ips.py:177
+#, python-format
+msgid "Floating ip not found for id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:162
+#, python-format
+msgid "No more floating ips in pool %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:164
+msgid "No more floating ips available."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:189
+#, python-format
+msgid "Floating ip %s has been disassociated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:216
+#: nova/api/openstack/compute/contrib/floating_ips.py:281
+#: nova/api/openstack/compute/contrib/security_groups.py:457
+msgid "Missing parameter dict"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:219
+#: nova/api/openstack/compute/contrib/floating_ips.py:284
+msgid "Address not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:226
+msgid "No nw_info cache associated with instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:231
+msgid "No fixed ips associated to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:242
+msgid "Specified fixed address not assigned to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:256
+msgid "floating ip is already associated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:259
+msgid "l3driver call to add floating ip failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:263
+#: nova/api/openstack/compute/contrib/floating_ips.py:292
+msgid "floating ip not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:266
+msgid "Error. Unable to associate floating ip"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:307
+msgid "Floating ip is not associated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:311
+#, python-format
+msgid "Floating ip %(address)s is not associated with instance %(id)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
+#: nova/cmd/manage.py:385
+#, python-format
+msgid "/%s should be specified as single address(es) not in cidr format"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fping.py:53
+msgid "fping utility is not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:183
+#, python-format
+msgid "Invalid update setting: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:186
+#, python-format
+msgid "Invalid status: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:188
+#, python-format
+msgid "Invalid mode: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:190
+msgid "'status' or 'maintenance_mode' needed for host update"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:206
+#, python-format
+msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:212
+msgid "Virt driver does not implement host maintenance mode."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:227
+#, python-format
+msgid "Enabling host %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:229
+#, python-format
+msgid "Disabling host %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:234
+msgid "Virt driver does not implement host disabled status."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:250
+msgid "Virt driver does not implement host power management."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:336
+msgid "Describe-resource is admin only functionality"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:183
+#: nova/api/openstack/compute/contrib/hypervisors.py:194
+#, python-format
+msgid "Hypervisor with ID '%s' could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:202
+msgid "Virt driver does not implement uptime function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:218
+#: nova/api/openstack/compute/contrib/hypervisors.py:228
+#, python-format
+msgid "No hypervisor matching '%s' could be found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/instance_usage_audit_log.py:57
+#, python-format
+msgid "Invalid timestamp for date %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:52
+msgid "Missing 'networkId' argument for addFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:68
+msgid "Missing 'address' argument for removeFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:77
+#, python-format
+msgid "Unable to find address %r"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:23
+#, python-format
+msgid "Disassociating host with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:27
+#: nova/api/openstack/compute/contrib/networks_associate.py:38
+#: nova/api/openstack/compute/contrib/networks_associate.py:50
+#: nova/api/openstack/compute/contrib/os_networks.py:79
+#: nova/api/openstack/compute/contrib/os_networks.py:89
+#: nova/api/openstack/compute/contrib/os_networks.py:99
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:110
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:132
+msgid "Network not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:34
+#, python-format
+msgid "Disassociating project with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:74
+#, python-format
+msgid "Disassociating network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:85
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:106
+#, python-format
+msgid "Showing network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:95
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:124
+#, python-format
+msgid "Deleting network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:110
+msgid "Missing network in body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:114
+msgid "Network label is required"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:118
+msgid "Network cidr or cidr_v6 is required"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:120
+#, python-format
+msgid "Creating network with label %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:136
+#, python-format
+msgid "Associating network %(network)s with project %(project)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:144
+msgid "VLAN support must be enabled"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:147
+#, python-format
+msgid "Cannot associate network %(network)s with project %(project)s: %(message)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:121
+msgid "Failed to update usages deallocating network."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:151
+msgid "No CIDR requested"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:157
+msgid "Requested network does not contain enough (2+) usable hosts"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:161
+msgid "CIDR is malformed."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:164
+msgid "Address could not be converted."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:172
+msgid "Quota exceeded, too many networks."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:183
+msgid "Create networks failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
+msgid "Quota limit must be -1 or greater."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
+#, python-format
+msgid "Bad key(s) %s in quota_set"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/scheduler_hints.py:38
+msgid "Malformed scheduler_hints attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
+#: nova/api/openstack/compute/contrib/security_groups.py:371
+msgid "Not enough parameters to build a valid rule."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:133
+msgid "This default rule already exists."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:154
+#, python-format
+msgid "Showing security_group_default_rule with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:158
+msgid "security group default rule not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:379
+#, python-format
+msgid "Bad prefix for network in cidr %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:460
+msgid "Security group not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:464
+msgid "Security group name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
+msgid "start instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
+msgid "stop instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:188
+msgid "Unknown service"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
+msgid "Invalid start time. The start time cannot occur after the end time."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:75
+#, python-format
+msgid "vol=%s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:187
+#, python-format
+msgid "Delete volume with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:380
+#, python-format
+msgid "Bad volumeId format: volumeId is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:399
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:579
+#, python-format
+msgid "Delete snapshot with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:619
+#, python-format
+msgid "Create snapshot from volume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:626
+#, python-format
+msgid "Invalid value '%s' for force."
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/__init__.py:35
+#, python-format
+msgid "Loaded extension %s"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/__init__.py:51
+#, python-format
+msgid "Ext version: %i"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
+#, python-format
+msgid "Reserving IP address %s"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
+#, python-format
+msgid "Unreserving IP address %s"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/servers.py:485
+#, python-format
+msgid "server create extension %s detected"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/servers.py:490
+#, python-format
+msgid "extension %s is missing server_create"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/servers.py:508
+msgid "Did not find any server create extensions"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/servers.py:1031
+#, python-format
+msgid "Running _create_extension_point for %s"
+msgstr ""
+
+#: nova/api/openstack/compute/views/servers.py:176
+msgid "Instance has had its instance_type removed from the DB"
+msgstr ""
+
+#: nova/cells/messaging.py:205
+#, python-format
+msgid "Error processing message locally: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
+#, python-format
+msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
+msgstr ""
+
+#: nova/cells/messaging.py:381
+#, python-format
+msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
+msgstr ""
+
+#: nova/cells/messaging.py:405
+#, python-format
+msgid "Error locating next hop for message: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:432
+#, python-format
+msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:511
+#, python-format
+msgid "Error locating next hops for message: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:531
+#, python-format
+msgid "Error sending message to next hops: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:549
+#, python-format
+msgid "Error waiting for responses from neighbor cells: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:664
+#, python-format
+msgid "Unknown method '%(method)s' in compute API"
+msgstr ""
+
+#: nova/cells/messaging.py:694
+#, python-format
+msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
+msgstr ""
+
+#: nova/cells/messaging.py:704
+#, python-format
+msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
+msgstr ""
+
+#: nova/cells/messaging.py:829
+#, python-format
+msgid "Got update for instance: %(instance)s"
+msgstr ""
+
+#: nova/cells/messaging.py:873
+msgid "Got update to delete instance"
+msgstr ""
+
+#: nova/cells/messaging.py:888
+#, python-format
+msgid "Got broadcast to %(delete_type)s delete instance"
+msgstr ""
+
+#: nova/cells/messaging.py:902
+#, python-format
+msgid "Got message to create instance fault: %(instance_fault)s"
+msgstr ""
+
+#: nova/cells/messaging.py:923
+#, python-format
+msgid ""
+"Forcing a sync of instances, project_id=%(projid_str)s, "
+"updated_since=%(since_str)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
+#, python-format
+msgid "Updating parents with our capabilities: %(capabs)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1182
+#, python-format
+msgid "Updating parents with our capacities: %(capacities)s"
+msgstr ""
+
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
+#: nova/cells/scheduler.py:128
+#, python-format
+msgid "Weighted cells: %(weighted_cells)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:144
+#, python-format
+msgid "Scheduling with routing_path=%(routing_path)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
+#, python-format
+msgid "Couldn't communicate with cell '%s'"
+msgstr ""
+
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
+msgid "Couldn't communicate with any cells"
+msgstr ""
+
+#: nova/cells/scheduler.py:184
+#, python-format
+msgid "Building instances with routing_path=%(routing_path)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:254
+#, python-format
+msgid ""
+"No cells available when scheduling.  Will retry in %(sleep_time)s "
+"second(s)"
+msgstr ""
+
+#: nova/cells/scheduler.py:260
+#, python-format
+msgid "Error scheduling instances %(instance_uuids)s"
+msgstr ""
+
+#: nova/cells/state.py:272
+msgid "Updating cell cache from db."
+msgstr ""
+
+#: nova/cells/state.py:317
+#, python-format
+msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
+msgstr ""
+
+#: nova/cells/state.py:333
+#, python-format
+msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
+msgstr ""
+
+#: nova/cells/filters/target_cell.py:57
+#, python-format
+msgid ""
+"Forcing direct route to %(cell_name)s because of 'target_cell' scheduler "
+"hint"
+msgstr ""
+
+#: nova/cells/weights/mute_child.py:65
+#, python-format
+msgid ""
+"%(cell)s has not been seen since %(last_seen)s and is being treated as "
+"mute."
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:53
+msgid "Template for cloudpipe instance boot script"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:56
+msgid "Network to push into openvpn config"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:59
+msgid "Netmask to push into openvpn config"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:128
+#, python-format
+msgid "Launching VPN for %s"
+msgstr ""
+
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
+#, python-format
+msgid "Failed to load %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:244
+#, python-format
+msgid "start deployment for node %(node_id)s, params %(params)s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:252
+#, python-format
+msgid "deployment to node %s failed"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:256
+#, python-format
+msgid "deployment to node %s done"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
+#, python-format
+msgid "Could not read %s. Re-running with sudo"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1259
+msgid "sudo failed, continuing as if nothing happened"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1261
+msgid "Please re-run nova-manage as root."
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
+msgid "Command failed, please check log for more info"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:46
+msgid "leasing ip"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:66
+msgid "releasing ip"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:121
+#, python-format
+msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:131
+msgid "Environment variable 'NETWORK_ID' must be set."
+msgstr ""
+
+#: nova/cmd/manage.py:206
+msgid ""
+"The above error may show that the database has not been created.\n"
+"Please create a database using 'nova-manage db sync' before running this "
+"command."
+msgstr ""
+
+#: nova/cmd/manage.py:241
+#, python-format
+msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
+msgstr ""
+
+#: nova/cmd/manage.py:247
+msgid "Quota"
+msgstr ""
+
+#: nova/cmd/manage.py:248
+msgid "Limit"
+msgstr ""
+
+#: nova/cmd/manage.py:249
+msgid "In Use"
+msgstr ""
+
+#: nova/cmd/manage.py:250
+msgid "Reserved"
+msgstr ""
+
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
+#, python-format
+msgid "error: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:298
+msgid "network"
+msgstr ""
+
+#: nova/cmd/manage.py:299
+msgid "IP address"
+msgstr ""
+
+#: nova/cmd/manage.py:300
+msgid "hostname"
+msgstr ""
+
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
+msgid "host"
+msgstr ""
+
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
+msgid "No fixed IP found."
+msgstr ""
+
+#: nova/cmd/manage.py:329
+#, python-format
+msgid "WARNING: fixed ip %s allocated to missing instance"
+msgstr ""
+
+#: nova/cmd/manage.py:392
+#, python-format
+msgid ""
+"Too many IP addresses will be generated.  Please increase /%s to reduce "
+"the number generated."
+msgstr ""
+
+#: nova/cmd/manage.py:443
+msgid "No floating IP addresses have been defined."
+msgstr ""
+
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
+msgid "id"
+msgstr ""
+
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
+msgid "IPv4"
+msgstr ""
+
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
+msgid "IPv6"
+msgstr ""
+
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
+msgid "start address"
+msgstr ""
+
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
+msgid "DNS1"
+msgstr ""
+
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
+msgid "DNS2"
+msgstr ""
+
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
+msgid "VlanID"
+msgstr ""
+
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
+#: nova/tests/test_nova_manage.py:219
+msgid "project"
+msgstr ""
+
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
+msgid "uuid"
+msgstr ""
+
+#: nova/cmd/manage.py:520
+msgid "No networks found"
+msgstr ""
+
+#: nova/cmd/manage.py:539
+msgid "Please specify either fixed_range or uuid"
+msgstr ""
+
+#: nova/cmd/manage.py:544
+msgid "UUID is required to delete Quantum Networks"
+msgstr ""
+
+#: nova/cmd/manage.py:547
+msgid "Deleting by fixed_range is not supported with the QuantumManager"
+msgstr ""
+
+#: nova/cmd/manage.py:610
+msgid "instance"
+msgstr ""
+
+#: nova/cmd/manage.py:611
+msgid "node"
+msgstr ""
+
+#: nova/cmd/manage.py:612
+msgid "type"
+msgstr ""
+
+#: nova/cmd/manage.py:613
+msgid "state"
+msgstr ""
+
+#: nova/cmd/manage.py:614
+msgid "launched"
+msgstr ""
+
+#: nova/cmd/manage.py:615
+msgid "image"
+msgstr ""
+
+#: nova/cmd/manage.py:616
+msgid "kernel"
+msgstr ""
+
+#: nova/cmd/manage.py:617
+msgid "ramdisk"
+msgstr ""
+
+#: nova/cmd/manage.py:619
+msgid "user"
+msgstr ""
+
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
+msgid "zone"
+msgstr ""
+
+#: nova/cmd/manage.py:621
+msgid "index"
+msgstr ""
+
+#: nova/cmd/manage.py:665
+msgid "Binary"
+msgstr ""
+
+#: nova/cmd/manage.py:666
+msgid "Host"
+msgstr ""
+
+#: nova/cmd/manage.py:667
+msgid "Zone"
+msgstr ""
+
+#: nova/cmd/manage.py:668
+msgid "Status"
+msgstr ""
+
+#: nova/cmd/manage.py:669
+msgid "State"
+msgstr ""
+
+#: nova/cmd/manage.py:670
+msgid "Updated_At"
+msgstr ""
+
+#: nova/cmd/manage.py:692
+#, python-format
+msgid "Service %(service)s on host %(host)s enabled."
+msgstr ""
+
+#: nova/cmd/manage.py:705
+#, python-format
+msgid "Service %(service)s on host %(host)s disabled."
+msgstr ""
+
+#: nova/cmd/manage.py:772
+msgid "An unexpected error has occurred."
+msgstr ""
+
+#: nova/cmd/manage.py:773
+msgid "[Result]"
+msgstr ""
+
+#: nova/cmd/manage.py:777
+msgid "HOST"
+msgstr ""
+
+#: nova/cmd/manage.py:778
+msgid "PROJECT"
+msgstr ""
+
+#: nova/cmd/manage.py:779
+msgid "cpu"
+msgstr ""
+
+#: nova/cmd/manage.py:780
+msgid "mem(mb)"
+msgstr ""
+
+#: nova/cmd/manage.py:781
+msgid "hdd"
+msgstr ""
+
+#: nova/cmd/manage.py:864
+msgid "Must supply a positive value for max_rows"
+msgstr ""
+
+#: nova/cmd/manage.py:903
+msgid "Must supply valid parameters to create instance_type"
+msgstr ""
+
+#: nova/cmd/manage.py:907
+msgid "Instance Type exists."
+msgstr ""
+
+#: nova/cmd/manage.py:908
+msgid "Please ensure instance_type name and flavorid are unique."
+msgstr ""
+
+#: nova/cmd/manage.py:910
+msgid "Currently defined instance_type names and flavorids:"
+msgstr ""
+
+#: nova/cmd/manage.py:915
+msgid "Unknown error"
+msgstr ""
+
+#: nova/cmd/manage.py:918
+#, python-format
+msgid "%s created"
+msgstr ""
+
+#: nova/cmd/manage.py:926
+msgid "Valid instance type name is required"
+msgstr ""
+
+#: nova/cmd/manage.py:929
+#, python-format
+msgid "DB Error: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:934
+#, python-format
+msgid "%s deleted"
+msgstr ""
+
+#: nova/cmd/manage.py:970
+#, python-format
+msgid "Key %(key)s set to %(value)s on instance type %(name)s"
+msgstr ""
+
+#: nova/cmd/manage.py:992
+#, python-format
+msgid "Key %(key)s on instance type %(name)s unset"
+msgstr ""
+
+#: nova/cmd/manage.py:1037
+#, python-format
+msgid "Hypervisor: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:1078
+#, python-format
+msgid "Line %(linenum)d : %(line)s"
+msgstr ""
+
+#: nova/cmd/manage.py:1080
+msgid "No errors in logfiles!"
+msgstr ""
+
+#: nova/cmd/manage.py:1092
+msgid "Unable to find system log file!"
+msgstr ""
+
+#: nova/cmd/manage.py:1096
+#, python-format
+msgid "Last %s nova syslog entries:-"
+msgstr ""
+
+#: nova/cmd/manage.py:1105
+msgid "No nova entries in syslog!"
+msgstr ""
+
+#: nova/compute/__init__.py:61
+msgid ""
+"The compute_api_class is now deprecated and will be removed in next "
+"release. Please set the cell_type option to api or compute"
+msgstr ""
+
+#: nova/compute/__init__.py:74
+msgid "cell_type must be configured as 'api' or 'compute'"
+msgstr ""
+
+#: nova/compute/api.py:302
+msgid "Cannot run any more instances of this type."
+msgstr ""
+
+#: nova/compute/api.py:309
+#, python-format
+msgid "Can only run %s more instances of this type."
+msgstr ""
+
+#: nova/compute/api.py:318
+#, python-format
+msgid ""
+"%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
+"instances. %(msg)s"
+msgstr ""
+
+#: nova/compute/api.py:338
+#, python-format
+msgid ""
+"Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
+"properties"
+msgstr ""
+
+#: nova/compute/api.py:348
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:352
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:356
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:489
+msgid "Failed to set instance name using multi_instance_display_name_template."
+msgstr ""
+
+#: nova/compute/api.py:571
+msgid "Cannot attach one or more volumes to multiple instances"
+msgstr ""
+
+#: nova/compute/api.py:667
+#, python-format
+msgid "Going to run %s instances..."
+msgstr ""
+
+#: nova/compute/api.py:812
+#, python-format
+msgid "bdm %s"
+msgstr ""
+
+#: nova/compute/api.py:839
+#, python-format
+msgid "block_device_mapping %s"
+msgstr ""
+
+#: nova/compute/api.py:1122
+msgid "instance termination disabled"
+msgstr ""
+
+#: nova/compute/api.py:1258
+#, python-format
+msgid "instance type %(old_inst_type_id)d not found"
+msgstr ""
+
+#: nova/compute/api.py:1264
+msgid "going to delete a resizing instance"
+msgstr ""
+
+#: nova/compute/api.py:1274
+#, python-format
+msgid "instance's host %s is down, deleting from database"
+msgstr ""
+
+#: nova/compute/api.py:1318
+msgid "Going to try to soft delete instance"
+msgstr ""
+
+#: nova/compute/api.py:1343
+msgid "Going to try to terminate instance"
+msgstr ""
+
+#: nova/compute/api.py:1394
+msgid "Going to try to stop instance"
+msgstr ""
+
+#: nova/compute/api.py:1410
+msgid "Going to try to start instance"
+msgstr ""
+
+#: nova/compute/api.py:1482
+#, python-format
+msgid "Searching by: %s"
+msgstr ""
+
+#: nova/compute/api.py:1719
+#, python-format
+msgid "snapshot for %s"
+msgstr ""
+
+#: nova/compute/api.py:2057
+msgid "flavor_id is None. Assuming migration."
+msgstr ""
+
+#: nova/compute/api.py:2066
+#, python-format
+msgid ""
+"Old instance type %(current_instance_type_name)s,  new instance type "
+"%(new_instance_type_name)s"
+msgstr ""
+
+#: nova/compute/api.py:2114
+#, python-format
+msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
+msgstr ""
+
+#: nova/compute/api.py:2253
+msgid "Cannot rescue a volume-backed instance"
+msgstr ""
+
+#: nova/compute/api.py:2358
+msgid "Locking"
+msgstr ""
+
+#: nova/compute/api.py:2366
+msgid "Unlocking"
+msgstr ""
+
+#: nova/compute/api.py:2438
+msgid "Volume must be attached in order to detach."
+msgstr ""
+
+#: nova/compute/api.py:2552
+#, python-format
+msgid "Going to try to live migrate instance to %s"
+msgstr ""
+
+#: nova/compute/api.py:2574
+msgid "vm evacuation scheduled"
+msgstr ""
+
+#: nova/compute/api.py:2578
+#, python-format
+msgid ""
+"Instance compute service state on %(inst_host)s expected to be down, but "
+"it was up."
+msgstr ""
+
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
+#: nova/tests/compute/test_keypairs.py:104
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
+#: nova/compute/api.py:2912
+#, python-format
+msgid "Security group %s is not a string or unicode"
+msgstr ""
+
+#: nova/compute/api.py:2915
+#, python-format
+msgid "Security group %s cannot be empty."
+msgstr ""
+
+#: nova/compute/api.py:2923
+#, python-format
+msgid ""
+"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
+"limited to '%(allowed)'."
+msgstr ""
+
+#: nova/compute/api.py:2929
+#, python-format
+msgid "Security group %s should not be greater than 255 characters."
+msgstr ""
+
+#: nova/compute/api.py:2947
+msgid "Quota exceeded, too many security groups."
+msgstr ""
+
+#: nova/compute/api.py:2950
+#, python-format
+msgid "Create Security Group %s"
+msgstr ""
+
+#: nova/compute/api.py:2957
+#, python-format
+msgid "Security group %s already exists"
+msgstr ""
+
+#: nova/compute/api.py:2976
+#, python-format
+msgid "Unable to update system group '%s'"
+msgstr ""
+
+#: nova/compute/api.py:3036
+#, python-format
+msgid "Unable to delete system group '%s'"
+msgstr ""
+
+#: nova/compute/api.py:3041
+msgid "Security group is still in use"
+msgstr ""
+
+#: nova/compute/api.py:3049
+msgid "Failed to update usages deallocating security group"
+msgstr ""
+
+#: nova/compute/api.py:3052
+#, python-format
+msgid "Delete security group %s"
+msgstr ""
+
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
+#, python-format
+msgid "Rule (%s) not found"
+msgstr ""
+
+#: nova/compute/api.py:3145
+msgid "Quota exceeded, too many security group rules."
+msgstr ""
+
+#: nova/compute/api.py:3148
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/compute/api.py:3157
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/compute/api.py:3210
+msgid "Security group id should be integer"
+msgstr ""
+
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
+#, python-format
+msgid "Aborting claim: %s"
+msgstr ""
+
+#: nova/compute/claims.py:113
+#, python-format
+msgid ""
+"Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d GB, VCPUs "
+"%(vcpus)d"
+msgstr ""
+
+#: nova/compute/claims.py:125
+msgid "Claim successful"
+msgstr ""
+
+#: nova/compute/claims.py:127
+msgid "Claim failed"
+msgstr ""
+
+#: nova/compute/claims.py:132
+msgid "Memory"
+msgstr ""
+
+#: nova/compute/claims.py:141
+msgid "Disk"
+msgstr ""
+
+#: nova/compute/claims.py:150
+msgid "CPU"
+msgstr ""
+
+#: nova/compute/claims.py:162
+#, python-format
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
+msgstr ""
+
+#: nova/compute/claims.py:169
+#, python-format
+msgid "%(type)s limit not specified, defaulting to unlimited"
+msgstr ""
+
+#: nova/compute/claims.py:176
+#, python-format
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
+msgstr ""
+
+#: nova/compute/claims.py:184
+#, python-format
+msgid ""
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
+msgstr ""
+
+#: nova/compute/flavors.py:92
+msgid "names can only contain [a-zA-Z0-9_.- ]"
+msgstr ""
+
+#: nova/compute/flavors.py:101
+#, python-format
+msgid "'%s' argument must be a positive integer"
+msgstr ""
+
+#: nova/compute/flavors.py:110
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
+
+#: nova/compute/flavors.py:119
+msgid "'rxtx_factor' argument must be a positive float"
+msgstr ""
+
+#: nova/compute/flavors.py:132
+msgid "is_public must be a boolean"
+msgstr ""
+
+#: nova/compute/flavors.py:137
+#, python-format
+msgid "DB error: %s"
+msgstr ""
+
+#: nova/compute/flavors.py:147
+#, python-format
+msgid "Instance type %s not found for deletion"
+msgstr ""
+
+#: nova/compute/manager.py:210
+msgid "Possibly task preempted."
+msgstr ""
+
+#: nova/compute/manager.py:383
+#, python-format
+msgid "%s is not a valid node managed by this compute host."
+msgstr ""
+
+#: nova/compute/manager.py:411
+msgid "Instance has been destroyed from under us while trying to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:460
+#, python-format
+msgid ""
+"Deleting instance as its host (%(instance_host)s) is not equal to our "
+"host (%(our_host)s)."
+msgstr ""
+
+#: nova/compute/manager.py:476
+msgid "Instance has been marked deleted already, removing it from the hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:497
+msgid ""
+"Hypervisor driver does not support instance shared storage check, "
+"assuming it's not on shared storage"
+msgstr ""
+
+#: nova/compute/manager.py:503
+msgid "Failed to check if instance shared"
+msgstr ""
+
+#: nova/compute/manager.py:545
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:571
+msgid "Failed to revert crashed migration"
+msgstr ""
+
+#: nova/compute/manager.py:574
+msgid "Instance found in migrating state during startup. Resetting task_state"
+msgstr ""
+
+#: nova/compute/manager.py:585
+#, python-format
+msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
+msgstr ""
+
+#: nova/compute/manager.py:591
+msgid "Rebooting instance after nova-compute restart."
+msgstr ""
+
+#: nova/compute/manager.py:605
+msgid "Hypervisor driver does not support resume guests"
+msgstr ""
+
+#: nova/compute/manager.py:610
+msgid "Failed to resume instance"
+msgstr ""
+
+#: nova/compute/manager.py:620
+msgid "Hypervisor driver does not support firewall rules"
+msgstr ""
+
+#: nova/compute/manager.py:624
+#, python-format
+msgid "Lifecycle event %(state)d on VM %(uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:640
+#, python-format
+msgid "Unexpected power state %d"
+msgstr ""
+
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
+#, python-format
+msgid "Ignoring event %s"
+msgstr ""
+
+#: nova/compute/manager.py:694
+msgid "Checking state"
+msgstr ""
+
+#: nova/compute/manager.py:792
+#, python-format
+msgid "Volume id: %s finished being created but was not set as 'available'"
+msgstr ""
+
+#: nova/compute/manager.py:809
+#, python-format
+msgid "Setting up bdm %s"
+msgstr ""
+
+#: nova/compute/manager.py:910
+msgid "Success"
+msgstr ""
+
+#: nova/compute/manager.py:933
+msgid "Instance disappeared before we could start it"
+msgstr ""
+
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
+#, python-format
+msgid "No node specified, defaulting to %s"
+msgstr ""
+
+#: nova/compute/manager.py:1004
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:1013
+msgid "Instance was deleted during spawn."
+msgstr ""
+
+#: nova/compute/manager.py:1044
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1061
+msgid "Clean up resource before rescheduling."
+msgstr ""
+
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
+msgid "Error trying to reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1099
+msgid "Retry info not present, will not reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1104
+msgid "No request spec, will not reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1110
+#, python-format
+msgid "Re-scheduling %(method)s: attempt %(num)d"
+msgstr ""
+
+#: nova/compute/manager.py:1139
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:1149
+msgid "Starting instance..."
+msgstr ""
+
+#: nova/compute/manager.py:1163
+msgid "Allocating IP information in the background."
+msgstr ""
+
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
+msgstr ""
+
+#: nova/compute/manager.py:1180
+#, python-format
+msgid "Instance network_info: |%s|"
+msgstr ""
+
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
+msgid "Instance failed block device setup"
+msgstr ""
+
+#: nova/compute/manager.py:1244
+msgid "Instance failed to spawn"
+msgstr ""
+
+#: nova/compute/manager.py:1295
+msgid "Deallocating network for instance"
+msgstr ""
+
+#: nova/compute/manager.py:1369
+msgid "Failed to deallocate network for instance."
+msgstr ""
+
+#: nova/compute/manager.py:1376
+#, python-format
+msgid "%(action_str)s instance"
+msgstr ""
+
+#: nova/compute/manager.py:1419
+#, python-format
+msgid "Ignoring DiskNotFound: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1422
+#, python-format
+msgid "Ignoring VolumeNotFound: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1429
+#, python-format
+msgid "terminating bdm %s"
+msgstr ""
+
+#: nova/compute/manager.py:1477
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:1703
+msgid "Rebuilding instance"
+msgstr ""
+
+#: nova/compute/manager.py:1716
+msgid "Invalid state of instance files on shared storage"
+msgstr ""
+
+#: nova/compute/manager.py:1720
+msgid "disk on shared storage, recreating using existing disk"
+msgstr ""
+
+#: nova/compute/manager.py:1724
+#, python-format
+msgid "disk not on shared storagerebuilding from: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:1807
+#, python-format
+msgid "bringing vm to original state: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:1839
+#, python-format
+msgid "Detaching from volume api: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1857
+msgid "Rebooting instance"
+msgstr ""
+
+#: nova/compute/manager.py:1876
+#, python-format
+msgid ""
+"trying to reboot a non-running instance: (state: %(state)s expected: "
+"%(running)s)"
+msgstr ""
+
+#: nova/compute/manager.py:1912
+msgid "Reboot failed but instance is running"
+msgstr ""
+
+#: nova/compute/manager.py:1915
+#, python-format
+msgid "Cannot reboot instance: %(error)s"
+msgstr ""
+
+#: nova/compute/manager.py:1928
+msgid "Instance disappeared during reboot"
+msgstr ""
+
+#: nova/compute/manager.py:1955
+msgid "instance snapshotting"
+msgstr ""
+
+#: nova/compute/manager.py:1961
+#, python-format
+msgid ""
+"trying to snapshot a non-running instance: (state: %(state)s expected: "
+"%(running)s)"
+msgstr ""
+
+#: nova/compute/manager.py:2022
+#, python-format
+msgid "Found %(num_images)d images (rotation: %(rotation)d)"
+msgstr ""
+
+#: nova/compute/manager.py:2030
+#, python-format
+msgid "Rotating out %d backups"
+msgstr ""
+
+#: nova/compute/manager.py:2035
+#, python-format
+msgid "Deleting image %s"
+msgstr ""
+
+#: nova/compute/manager.py:2063
+#, python-format
+msgid "Failed to set admin password. Instance %s is not running"
+msgstr ""
+
+#: nova/compute/manager.py:2070
+msgid "Root password set"
+msgstr ""
+
+#: nova/compute/manager.py:2077
+msgid "set_admin_password is not implemented by this driver or guest instance."
+msgstr ""
+
+#: nova/compute/manager.py:2092
+#, python-format
+msgid "set_admin_password failed: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2099
+msgid "error setting admin password"
+msgstr ""
+
+#: nova/compute/manager.py:2112
+#, python-format
+msgid ""
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
+msgstr ""
+
+#: nova/compute/manager.py:2117
+#, python-format
+msgid "injecting file to %s"
+msgstr ""
+
+#: nova/compute/manager.py:2137
+msgid ""
+"Unable to find a different image to use for rescue VM, using instance's "
+"current image"
+msgstr ""
+
+#: nova/compute/manager.py:2150
+msgid "Rescuing"
+msgstr ""
+
+#: nova/compute/manager.py:2169
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2173
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2191
+msgid "Unrescuing"
+msgstr ""
+
+#: nova/compute/manager.py:2212
+#, python-format
+msgid "Changing instance metadata according to %r"
+msgstr ""
+
+#: nova/compute/manager.py:2434
+#, python-format
+msgid "Updating instance to original state: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:2468
+msgid "Instance has no source host"
+msgstr ""
+
+#: nova/compute/manager.py:2474
+msgid "destination same as source!"
+msgstr ""
+
+#: nova/compute/manager.py:2495
+msgid "Migrating"
+msgstr ""
+
+#: nova/compute/manager.py:2746
+#, python-format
+msgid "Failed to rollback quota for failed finish_resize: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2809
+msgid "Pausing"
+msgstr ""
+
+#: nova/compute/manager.py:2827
+msgid "Unpausing"
+msgstr ""
+
+#: nova/compute/manager.py:2866
+msgid "Retrieving diagnostics"
+msgstr ""
+
+#: nova/compute/manager.py:2897
+msgid "Resuming"
+msgstr ""
+
+#: nova/compute/manager.py:2917
+msgid "Reset network"
+msgstr ""
+
+#: nova/compute/manager.py:2922
+msgid "Inject network info"
+msgstr ""
+
+#: nova/compute/manager.py:2925
+#, python-format
+msgid "network_info to inject: |%s|"
+msgstr ""
+
+#: nova/compute/manager.py:2942
+msgid "Get console output"
+msgstr ""
+
+#: nova/compute/manager.py:2969
+msgid "Getting vnc console"
+msgstr ""
+
+#: nova/compute/manager.py:3004
+msgid "Getting spice console"
+msgstr ""
+
+#: nova/compute/manager.py:3052
+#, python-format
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3103
+#, python-format
+msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3113
+#, python-format
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3129
+#, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3160
+#, python-format
+msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
+msgstr ""
+
+#: nova/compute/manager.py:3171
+msgid "Detaching volume from unknown instance"
+msgstr ""
+
+#: nova/compute/manager.py:3178
+#, python-format
+msgid "Failed to detach volume %(volume_id)s from %(mp)s"
+msgstr ""
+
+#: nova/compute/manager.py:3202
+msgid "Updating volume usage cache with totals"
+msgstr ""
+
+#: nova/compute/manager.py:3238
+#, python-format
+msgid "allocate_port_for_instance returned %(ports)s ports"
+msgstr ""
+
+#: nova/compute/manager.py:3258
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
+
+#: nova/compute/manager.py:3272
+#, python-format
+msgid "Host %s not found"
+msgstr ""
+
+#: nova/compute/manager.py:3425
+#, python-format
+msgid "Pre live migration failed at %s"
+msgstr ""
+
+#: nova/compute/manager.py:3453
+msgid "_post_live_migration() is started.."
+msgstr ""
+
+#: nova/compute/manager.py:3508
+#, python-format
+msgid "Migrating instance to %s finished successfully."
+msgstr ""
+
+#: nova/compute/manager.py:3510
+msgid ""
+"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
+"with matching name.\" This error can be safely ignored."
+msgstr ""
+
+#: nova/compute/manager.py:3525
+msgid "Post operation of migration started"
+msgstr ""
+
+#: nova/compute/manager.py:3557
+#, python-format
+msgid "Failed to get compute_info for %s"
+msgstr ""
+
+#: nova/compute/manager.py:3686
+msgid "Updated the info_cache for instance"
+msgstr ""
+
+#: nova/compute/manager.py:3738
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:3743
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:3752
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:3760
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
+
+#: nova/compute/manager.py:3765
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:3772
+#, python-format
+msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
+msgstr ""
+
+#: nova/compute/manager.py:3783
+#, python-format
+msgid "Error auto-confirming resize: %s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:3799
+#, python-format
+msgid ""
+"Running instance usage audit for host %(host)s from %(begin_time)s to "
+"%(end_time)s. %(number_instances)s instances."
+msgstr ""
+
+#: nova/compute/manager.py:3819
+#, python-format
+msgid "Failed to generate usage audit for instance on host %s"
+msgstr ""
+
+#: nova/compute/manager.py:3843
+msgid "Updating bandwidth usage cache"
+msgstr ""
+
+#: nova/compute/manager.py:3946
+msgid "Updating volume usage cache"
+msgstr ""
+
+#: nova/compute/manager.py:3960
+msgid "Updating host status"
+msgstr ""
+
+#: nova/compute/manager.py:3987
+#, python-format
+msgid ""
+"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
+"the hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
+msgid "During sync_power_state the instance has a pending task. Skip."
+msgstr ""
+
+#: nova/compute/manager.py:4030
+#, python-format
+msgid ""
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:4067
+msgid "Instance shutdown by itself. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
+msgid "error during stop() in sync_power_state."
+msgstr ""
+
+#: nova/compute/manager.py:4083
+msgid "Instance is suspended unexpectedly. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:4099
+msgid "Instance is paused unexpectedly. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:4105
+msgid "Instance is unexpectedly not found. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:4111
+msgid "Instance is not stopped. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:4127
+msgid "Instance is not (soft-)deleted."
+msgstr ""
+
+#: nova/compute/manager.py:4135
+msgid "CONF.reclaim_instance_interval <= 0, skipping..."
+msgstr ""
+
+#: nova/compute/manager.py:4148
+msgid "Reclaiming deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:4175
+#, python-format
+msgid "Deleting orphan compute node %s"
+msgstr ""
+
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
+#, python-format
+msgid "No service record for host %s"
+msgstr ""
+
+#: nova/compute/manager.py:4225
+#, python-format
+msgid ""
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
+msgstr ""
+
+#: nova/compute/manager.py:4231
+#, python-format
+msgid ""
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
+msgstr ""
+
+#: nova/compute/manager.py:4238
+#, python-format
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
+msgstr ""
+
+#: nova/compute/manager.py:4265
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:92
+msgid ""
+"Host field should not be set on the instance until resources have been "
+"claimed."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:97
+msgid ""
+"Node field should be not be set on the instance until resources have been"
+" claimed."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:244
+msgid "Auditing locally available compute resources"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:249
+msgid ""
+"Virt driver does not support 'get_available_resource'  Compute tracking "
+"is disabled."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:301
+#, python-format
+msgid "Compute_service record created for %(host)s:%(node)s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:307
+#, python-format
+msgid "Compute_service record updated for %(host)s:%(node)s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:331
+#, python-format
+msgid "Hypervisor: free ram (MB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:332
+#, python-format
+msgid "Hypervisor: free disk (GB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:337
+#, python-format
+msgid "Hypervisor: free VCPUs: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:339
+msgid "Hypervisor: VCPU information unavailable"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:346
+#, python-format
+msgid "Free ram (MB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:347
+#, python-format
+msgid "Free disk (GB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:352
+#, python-format
+msgid "Free VCPUS: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:354
+msgid "Free VCPU information unavailable"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:383
+#, python-format
+msgid "Updating from migration %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:443
+msgid "Instance not resizing, skipping migration."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:458
+msgid "InstanceType could not be found, skipping migration."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:542
+#, python-format
+msgid ""
+"Detected running orphan instance: %(uuid)s (consuming %(memory_mb)s MB "
+"memory"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:555
+#, python-format
+msgid "Missing keys: %s"
+msgstr ""
+
+#: nova/compute/rpcapi.py:58
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/rpcapi.py:61
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/utils.py:141
+#, python-format
+msgid "Using %(prefix)s instead of %(req_prefix)s"
+msgstr ""
+
+#: nova/conductor/api.py:399
+msgid ""
+"Timed out waiting for nova-conductor. Is it running? Or did this service "
+"start before nova-conductor?"
+msgstr ""
+
+#: nova/conductor/manager.py:116
+#, python-format
+msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
+msgstr ""
+
+#: nova/conductor/manager.py:322
+msgid "Invalid block_device_mapping_destroy invocation"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
+#: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
+msgid "Adding console"
+msgstr ""
+
+#: nova/console/manager.py:101 nova/console/vmrc_manager.py:113
+#, python-format
+msgid "Tried to remove non-existent console %(console_id)s."
+msgstr ""
+
+#: nova/console/vmrc_manager.py:116
+#, python-format
+msgid "Removing console %(console_id)s."
+msgstr ""
+
+#: nova/console/websocketproxy.py:54
+msgid "Invalid Token"
+msgstr ""
+
+#: nova/console/websocketproxy.py:73
+msgid "Invalid Connection Info"
+msgstr ""
+
+#: nova/console/xvp.py:100
+msgid "Rebuilding xvp conf"
+msgstr ""
+
+#: nova/console/xvp.py:119
+#, python-format
+msgid "Re-wrote %s"
+msgstr ""
+
+#: nova/console/xvp.py:124
+msgid "Failed to write configuration file"
+msgstr ""
+
+#: nova/console/xvp.py:127
+msgid "Stopping xvp"
+msgstr ""
+
+#: nova/console/xvp.py:140
+msgid "Starting xvp"
+msgstr ""
+
+#: nova/console/xvp.py:147
+#, python-format
+msgid "Error starting xvp: %s"
+msgstr ""
+
+#: nova/console/xvp.py:150
+msgid "Restarting xvp"
+msgstr ""
+
+#: nova/console/xvp.py:152
+msgid "xvp not running..."
+msgstr ""
+
+#: nova/console/xvp.py:203
+msgid "Failed to run xvp."
+msgstr ""
+
+#: nova/consoleauth/manager.py:89
+#, python-format
+msgid "Received Token: %(token)s, %(token_dict)s)"
+msgstr ""
+
+#: nova/consoleauth/manager.py:113
+#, python-format
+msgid "Checking Token: %(token)s, %(token_valid)s)"
+msgstr ""
+
+#: nova/db/api.py:592
+msgid "Failed to notify cells of instance destroy"
+msgstr ""
+
+#: nova/db/api.py:674 nova/db/api.py:695
+msgid "Failed to notify cells of instance update"
+msgstr ""
+
+#: nova/db/api.py:1551
+msgid "Failed to notify cells of bw_usage update"
+msgstr ""
+
+#: nova/db/api.py:1690
+msgid "Failed to notify cells of instance fault"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:160
+#, python-format
+msgid "Deadlock detected when running '%(func_name)s': Retrying..."
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:195
+msgid "model or base_model parameter should be subclass of NovaBase"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:649
+#, python-format
+msgid "Invalid floating ip id %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:870
+#, python-format
+msgid "Invalid floating IP %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
+#, python-format
+msgid "Invalid fixed IP Address %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1332
+#, python-format
+msgid "Invalid virtual interface address %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1425
+#, python-format
+msgid ""
+"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
+"empty, \"global\" or \"project\""
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1560
+#, python-format
+msgid "Invalid instance id %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:2915
+#, python-format
+msgid "Change will make usage less than 0 for the following resources: %(unders)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:4451
+#, python-format
+msgid ""
+"Volume(%s) has lower stats then what is in the database. Instance must "
+"have been rebooted or crashed. Updating totals."
+msgstr ""
+
+#: nova/db/sqlalchemy/migration.py:69
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:66
+msgid "version should be an integer"
+msgstr ""
+
+#: nova/db/sqlalchemy/migration.py:96
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:94
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:77
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:83
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:210
+#, python-format
+msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:244
+#, python-format
+msgid "Missing column %(table)s.%(column)s in shadow table"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:250
+#, python-format
+msgid ""
+"Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
+"%(shadow_c_type)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:259
+#, python-format
+msgid "Extra column %(table)%.%(column)s in shadow table"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:279
+msgid "Specify `table_name` or `table` param"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:282
+msgid "Specify only one param `table_name` `table`"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
+msgid "Exception while creating table."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:316
+msgid "Unsupported id columns type"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:62
+msgid "Exception while seeding instance_types table"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/145_add_volume_usage_cache.py:68
+msgid "volume_usage_cache table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:77
+#, python-format
+msgid "table '%s' not dropped"
+msgstr ""
+
+#: nova/image/glance.py:187
+#, python-format
+msgid ""
+"Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
+"%(extra)s."
+msgstr ""
+
+#: nova/image/glance.py:496
+#, python-format
+msgid "fetching image %s from glance"
+msgstr ""
+
+#: nova/image/s3.py:332
+#, python-format
+msgid "Failed to download %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:349
+#, python-format
+msgid "Failed to decrypt %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:360
+#, python-format
+msgid "Failed to untar %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:370
+#, python-format
+msgid "Failed to upload %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:382
+#, python-format
+msgid "Image %s was deleted underneath us"
+msgstr ""
+
+#: nova/image/s3.py:397
+#, python-format
+msgid "Failed to decrypt private key: %s"
+msgstr ""
+
+#: nova/image/s3.py:404
+#, python-format
+msgid "Failed to decrypt initialization vector: %s"
+msgstr ""
+
+#: nova/image/s3.py:415
+#, python-format
+msgid "Failed to decrypt image file %(image_file)s: %(err)s"
+msgstr ""
+
+#: nova/image/s3.py:427
+msgid "Unsafe filenames in image"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:38 nova/ipv6/rfc2462.py:34
+#, python-format
+msgid "Bad mac for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36
+#, python-format
+msgid "Bad prefix for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:42
+#, python-format
+msgid "Bad project_id for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/network/api.py:56
+msgid "instance is a required argument to use @refresh_cache"
+msgstr ""
+
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
+msgid "Failed storing info cache"
+msgstr ""
+
+#: nova/network/api.py:248
+#, python-format
+msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
+msgstr ""
+
+#: nova/network/driver.py:40
+msgid "Network driver option required, but not specified"
+msgstr ""
+
+#: nova/network/driver.py:43
+#, python-format
+msgid "Loading network driver '%s'"
+msgstr ""
+
+#: nova/network/floating_ips.py:88
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/floating_ips.py:98 nova/network/floating_ips.py:374
+#, python-format
+msgid "Interface %(interface)s not found"
+msgstr ""
+
+#: nova/network/floating_ips.py:122
+#, python-format
+msgid "floating IP allocation for instance |%(floating_address)s|"
+msgstr ""
+
+#: nova/network/floating_ips.py:179
+msgid "Floating IP is not associated. Ignore."
+msgstr ""
+
+#: nova/network/floating_ips.py:197
+#, python-format
+msgid "Address |%(address)s| is not allocated"
+msgstr ""
+
+#: nova/network/floating_ips.py:201
+#, python-format
+msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
+msgstr ""
+
+#: nova/network/floating_ips.py:221
+#, python-format
+msgid "Quota exceeded for %(pid)s, tried to allocate floating IP"
+msgstr ""
+
+#: nova/network/floating_ips.py:282
+msgid "Failed to update usages deallocating floating IP"
+msgstr ""
+
+#: nova/network/floating_ips.py:532
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/floating_ips.py:539
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/floating_ips.py:574
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/floating_ips.py:582
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/floating_ips.py:630
+#, python-format
+msgid ""
+"Database inconsistency: DNS domain |%s| is registered in the Nova db but "
+"not visible to either the floating or instance DNS driver. It will be "
+"ignored."
+msgstr ""
+
+#: nova/network/floating_ips.py:670
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
+msgstr ""
+
+#: nova/network/floating_ips.py:679
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
+msgstr ""
+
+#: nova/network/ldapdns.py:102
+#, python-format
+msgid ""
+"Found multiple matches for domain %(domain)s.\n"
+"%(entry)s"
+msgstr ""
+
+#: nova/network/ldapdns.py:129
+#, python-format
+msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
+msgstr ""
+
+#: nova/network/ldapdns.py:325
+msgid "This driver only supports type 'a' entries."
+msgstr ""
+
+#: nova/network/ldapdns.py:368
+msgid "This shouldn't be getting called except during testing."
+msgstr ""
+
+#: nova/network/linux_net.py:219
+#, python-format
+msgid "Attempted to remove chain %s which does not exist"
+msgstr ""
+
+#: nova/network/linux_net.py:254
+#, python-format
+msgid "Unknown chain: %r"
+msgstr ""
+
+#: nova/network/linux_net.py:279
+#, python-format
+msgid ""
+"Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
+"%(top)r"
+msgstr ""
+
+#: nova/network/linux_net.py:424
+msgid "IPTablesManager.apply completed with success"
+msgstr ""
+
+#: nova/network/linux_net.py:681
+#, python-format
+msgid "arping error for ip %s"
+msgstr ""
+
+#: nova/network/linux_net.py:731
+#, python-format
+msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
+msgstr ""
+
+#: nova/network/linux_net.py:779
+#, python-format
+msgid "Error deleting conntrack entries for %s"
+msgstr ""
+
+#: nova/network/linux_net.py:980
+#, python-format
+msgid "Pid %d is stale, skip killing dnsmasq"
+msgstr ""
+
+#: nova/network/linux_net.py:1025
+#, python-format
+msgid "Hupping dnsmasq threw %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1027
+#, python-format
+msgid "Pid %d is stale, relaunching dnsmasq"
+msgstr ""
+
+#: nova/network/linux_net.py:1107
+#, python-format
+msgid "killing radvd threw %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1109
+#, python-format
+msgid "Pid %d is stale, relaunching radvd"
+msgstr ""
+
+#: nova/network/linux_net.py:1297
+#, python-format
+msgid "Net device removed: '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1300
+#, python-format
+msgid "Failed removing net device: '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1418
+#, python-format
+msgid "Starting VLAN interface %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1464
+#, python-format
+msgid "Starting Bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1476
+#, python-format
+msgid "Adding interface %(interface)s to bridge %(bridge)s"
+msgstr ""
+
+#: nova/network/linux_net.py:1512
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1749
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1757
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/manager.py:365
+#, python-format
+msgid "Disassociated %s stale fixed ip(s)"
+msgstr ""
+
+#: nova/network/manager.py:369
+msgid "setting network host"
+msgstr ""
+
+#: nova/network/manager.py:481
+msgid "network allocations"
+msgstr ""
+
+#: nova/network/manager.py:488
+#, python-format
+msgid "networks retrieved for instance: |%(networks_list)s|"
+msgstr ""
+
+#: nova/network/manager.py:536
+msgid "network deallocation for instance"
+msgstr ""
+
+#: nova/network/manager.py:803
+#, python-format
+msgid ""
+"instance-dns-zone is |%(domain)s|, which is in availability zone "
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
+msgstr ""
+
+#: nova/network/manager.py:829
+#, python-format
+msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
+msgstr ""
+
+#: nova/network/manager.py:881
+msgid "Failed to update usages deallocating fixed IP"
+msgstr ""
+
+#: nova/network/manager.py:913
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:936
+#, python-format
+msgid "Leased IP |%(address)s|"
+msgstr ""
+
+#: nova/network/manager.py:940
+#, python-format
+msgid "IP %s leased that is not associated"
+msgstr ""
+
+#: nova/network/manager.py:949
+#, python-format
+msgid "IP |%s| leased that isn't allocated"
+msgstr ""
+
+#: nova/network/manager.py:954
+#, python-format
+msgid "Released IP |%(address)s|"
+msgstr ""
+
+#: nova/network/manager.py:958
+#, python-format
+msgid "IP %s released that is not associated"
+msgstr ""
+
+#: nova/network/manager.py:962
+#, python-format
+msgid "IP %s released that was not leased"
+msgstr ""
+
+#: nova/network/manager.py:981
+#, python-format
+msgid "%s must be an integer"
+msgstr ""
+
+#: nova/network/manager.py:1005
+msgid "Maximum allowed length for 'label' is 255."
+msgstr ""
+
+#: nova/network/manager.py:1025
+#, python-format
+msgid ""
+"Subnet(s) too large, defaulting to /%s.  To override, specify "
+"network_size flag."
+msgstr ""
+
+#: nova/network/manager.py:1107
+msgid "cidr already in use"
+msgstr ""
+
+#: nova/network/manager.py:1110
+#, python-format
+msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
+msgstr ""
+
+#: nova/network/manager.py:1121
+#, python-format
+msgid ""
+"requested cidr (%(cidr)s) conflicts with existing smaller cidr "
+"(%(smaller)s)"
+msgstr ""
+
+#: nova/network/manager.py:1178
+msgid "Network already exists!"
+msgstr ""
+
+#: nova/network/manager.py:1197
+#, python-format
+msgid "Network must be disassociated from project %s before delete"
+msgstr ""
+
+#: nova/network/manager.py:1792
+msgid ""
+"The sum between the number of networks and the vlan start cannot be "
+"greater than 4094"
+msgstr ""
+
+#: nova/network/manager.py:1799
+#, python-format
+msgid ""
+"The network range is not big enough to fit %(num_networks)s networks. "
+"Network size is %(network_size)s"
+msgstr ""
+
+#: nova/network/minidns.py:48
+#, python-format
+msgid "minidns file is |%s|"
+msgstr ""
+
+#: nova/network/minidns.py:75 nova/network/minidns.py:106
+msgid "Invalid name"
+msgstr ""
+
+#: nova/network/minidns.py:78
+msgid "This driver only supports type 'a'"
+msgstr ""
+
+#: nova/network/minidns.py:122
+#, python-format
+msgid "Cannot delete entry |%s|"
+msgstr ""
+
+#: nova/network/minidns.py:201
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: nova/network/minidns.py:207
+#, python-format
+msgid "Cannot delete domain |%s|"
+msgstr ""
+
+#: nova/network/model.py:383
+msgid "v4 subnets are required for legacy nw_info"
+msgstr ""
+
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:152
+#, python-format
+msgid "allocate_for_instance() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:155
+#, python-format
+msgid "empty project id for instance %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:201
+#, python-format
+msgid ""
+"Multiple security groups found matching '%s'. Use an ID to be more "
+"specific."
+msgstr ""
+
+#: nova/network/quantumv2/api.py:270
+msgid "Port not found"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:278
+#, python-format
+msgid "Fail to delete port %(portid)s with failure: %(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:318
+#, python-format
+msgid "deallocate_for_instance() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:327
+#, python-format
+msgid "Failed to delete quantum port %(portid)s "
+msgstr ""
+
+#: nova/network/quantumv2/api.py:349
+#, python-format
+msgid "Failed to delete quantum port %(port_id)s "
+msgstr ""
+
+#: nova/network/quantumv2/api.py:373
+#, python-format
+msgid "get_instance_nw_info() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:405
+#, python-format
+msgid ""
+"Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
+"%(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:435
+#, python-format
+msgid "Unable to update port %(portid)s with failure: %(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:445
+#, python-format
+msgid "validate_networks() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:688
+#, python-format
+msgid "Multiple floating IP pools matches found for name '%s'"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:56
+#, python-format
+msgid "Quantum Error creating security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:75
+#, python-format
+msgid "Quantum Error updating security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:129
+#, python-format
+msgid "Quantum security group %s not found"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
+#, python-format
+msgid "Quantum Error: %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:153
+msgid "Quantum Error getting security groups"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:162
+msgid "Security group id should be uuid"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:199
+#, python-format
+msgid "Quantum Error getting security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
+msgid "Quantum Error:"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:257
+#, python-format
+msgid "Quantum Error unable to delete %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:267
+#, python-format
+msgid "Quantum security group rule %s not found"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:382
+#, python-format
+msgid ""
+"Cannot add security group %(name)s to %(instance)s since the port "
+"%(port_id)s does not meet security requirements"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
+#, python-format
+msgid "Adding security group %(security_group_id)s to port %(port_id)s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:453
+#, python-format
+msgid ""
+"Security group %(security_group_name)s not assocaited with the instance "
+"%(instance)s"
+msgstr ""
+
+#: nova/network/security_group/security_group_base.py:137
+#, python-format
+msgid "This rule already exists in group %s"
+msgstr ""
+
+#: nova/objects/base.py:54
+#, python-format
+msgid "Error setting %(attr)s"
+msgstr ""
+
+#: nova/objects/base.py:145
+msgid "Invalid version string"
+msgstr ""
+
+#: nova/objects/base.py:202
+#, python-format
+msgid "Unable to instantiate unregistered object type %(objtype)s"
+msgstr ""
+
+#: nova/objects/base.py:305
+#, python-format
+msgid "Cannot load '%(attrname)s' in the base class"
+msgstr ""
+
+#: nova/openstack/common/excutils.py:48
+#, python-format
+msgid "Original exception being dropped: %s"
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:102
+#, python-format
+msgid "Could not release the acquired lock `%s`"
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:188
+#, python-format
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:199
+#, python-format
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:226
+#, python-format
+msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:234
+#, python-format
+msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/log.py:244
+#, python-format
+msgid "Deprecated: %s"
+msgstr ""
+
+#: nova/openstack/common/log.py:336
+#, python-format
+msgid "Error loading logging config %(log_config)s: %(err_msg)s"
+msgstr ""
+
+#: nova/openstack/common/log.py:386
+#, python-format
+msgid "syslog facility must be one of: %s"
+msgstr ""
+
+#: nova/openstack/common/log.py:555
+#, python-format
+msgid "Fatal call to deprecated config: %(msg)s"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:84
+#, python-format
+msgid "task run outlasted interval by %s sec"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:91
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:131
+#, python-format
+msgid "Dynamic looping call sleeping for %.02f seconds"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:41
+#, python-format
+msgid "Unexpected argument for periodic task creation: %(arg)s."
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:132
+#, python-format
+msgid "Skipping periodic task %(task)s because its interval is negative"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:137
+#, python-format
+msgid "Skipping periodic task %(task)s because it is disabled"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:175
+#, python-format
+msgid "Running periodic task %(full_task_name)s"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:183
+#, python-format
+msgid "Error during %(full_task_name)s: %(e)s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:394
+#, python-format
+msgid "Failed to understand rule %(rule)s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:86
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:462
+msgid "DB exception wrapped."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:513
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:585
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:125
+#, python-format
+msgid "%s not in valid priorities"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:141
+#, python-format
+msgid ""
+"Problem '%(e)s' attempting to send to notification system. "
+"Payload=%(payload)s"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:171
+#, python-format
+msgid "Failed to load notifier %s. These notifications will not be sent."
+msgstr ""
+
+#: nova/openstack/common/notifier/rabbit_notifier.py:27
+msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
+msgstr ""
+
+#: nova/openstack/common/notifier/rpc_notifier.py:45
+#: nova/openstack/common/notifier/rpc_notifier2.py:51
+#, python-format
+msgid "Could not send notification to %(topic)s. Payload=%(message)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/__init__.py:106
+#, python-format
+msgid ""
+"A RPC is being made while holding a lock. The locks currently held are "
+"%(locks)s. This is probably a bug. Please report it. Include the "
+"following: [%(stack)s]."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:75
+msgid "Pool creating new connection"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:200
+#, python-format
+msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:208
+#, python-format
+msgid ""
+"Number of call waiters is greater than warning threshhold: %d. There "
+"could be a MulticallProxyWaiter leak."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:291
+#, python-format
+msgid "unpacked context: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:337
+#, python-format
+msgid "UNIQUE_ID is %s."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:406
+#, python-format
+msgid "received %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:414
+#, python-format
+msgid "no method for message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:415
+#, python-format
+msgid "No method for message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
+#, python-format
+msgid "Expected exception during message handling (%s)"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
+msgid "Exception during message handling"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:586
+#, python-format
+msgid "Making synchronous call on %s ..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:589
+#, python-format
+msgid "MSG_ID is %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:623
+#, python-format
+msgid "Making asynchronous cast on %s..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:632
+msgid "Making asynchronous fanout cast..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:660
+#, python-format
+msgid "Sending %(event_type)s on %(topic)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:75
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:105
+#, python-format
+msgid ""
+"Remote error: %(exc_type)s %(value)s\n"
+"%(traceback)s."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:122
+#, python-format
+msgid ""
+"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
+" \"%(method)s\" info: \"%(info)s\""
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:138
+#: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
+msgid "<unknown>"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:144
+#, python-format
+msgid "Found duplicate message(%(msg_id)s). Skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:148
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:152
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:157
+#, python-format
+msgid ""
+"Specified RPC envelope version, %(version)s, not supported by this "
+"endpoint."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
+#, python-format
+msgid "Failed to sanitize %(item)s. Key error %(err)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:307
+#, python-format
+msgid "Returning exception %s to caller"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:169
+#: nova/openstack/common/rpc/impl_qpid.py:153
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:480
+#, python-format
+msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:502
+#, python-format
+msgid "Connected to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:539
+#, python-format
+msgid ""
+"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
+"%(max_retries)d tries: %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:555
+#, python-format
+msgid ""
+"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
+"again in %(sleep_time)d seconds."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:609
+#: nova/openstack/common/rpc/impl_qpid.py:457
+#, python-format
+msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:627
+#: nova/openstack/common/rpc/impl_qpid.py:472
+#, python-format
+msgid "Timed out waiting for RPC response: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:631
+#: nova/openstack/common/rpc/impl_qpid.py:476
+#, python-format
+msgid "Failed to consume message from queue: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:670
+#: nova/openstack/common/rpc/impl_qpid.py:511
+#, python-format
+msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:399
+#, python-format
+msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:405
+#, python-format
+msgid "Connected to AMQP server on %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:418
+msgid "Re-established AMQP queues"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:484
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:97
+msgid "JSON serialization failed."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:104
+#, python-format
+msgid "Deserializing: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:140
+#, python-format
+msgid "Connecting to %(addr)s with %(type)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:141
+#, python-format
+msgid "-> Subscribed to %(subscribe)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:142
+#, python-format
+msgid "-> bind: %(bind)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:150
+msgid "Could not open socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:162
+#, python-format
+msgid "Subscribing to %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:204
+msgid "You cannot recv on this socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:209
+msgid "You cannot send on this socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:273
+#, python-format
+msgid "Running func with context: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:311
+msgid "Sending reply"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:345
+msgid "RPC message did not include method."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:380
+msgid "Registering reactor"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:392
+msgid "In reactor registered"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:407
+msgid "Out reactor registered"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:411
+msgid "Consuming socket"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:453
+#, python-format
+msgid "CONSUMER GOT %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:465
+#, python-format
+msgid "Creating proxy for topic: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:471
+msgid "Topic contained dangerous characters."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:496
+#, python-format
+msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:505
+msgid "Topic socket file creation failed."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:510
+#, python-format
+msgid "ROUTER RELAY-OUT QUEUED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:513
+#, python-format
+msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:532
+#, python-format
+msgid "Could not create IPC directory %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:542
+msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:576
+#, python-format
+msgid "CONSUMER RECEIVED DATA: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:578
+#, python-format
+msgid "ROUTER RELAY-OUT %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:600
+msgid "ZMQ Envelope version unsupported or unknown."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:628
+msgid "Skipping topic registration. Already registered."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:635
+#, python-format
+msgid "Consumer is a zmq.%s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:687
+msgid "Creating payload"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:700
+msgid "Creating queue socket for reply waiter"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:713
+msgid "Sending cast"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:716
+msgid "Cast sent; Waiting reply"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:719
+#, python-format
+msgid "Received message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:720
+msgid "Unpacking response"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:729
+msgid "Unsupported or unknown ZMQ envelope returned."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:736
+msgid "RPC Message Invalid."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:760
+#, python-format
+msgid "%(msg)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:763
+#, python-format
+msgid "Sending message(s) to: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:767
+msgid "No matchmaker results. Not casting."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:770
+msgid "No match from matchmaker."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:53
+msgid "Match not found by MatchMaker."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:89
+msgid "Matchmaker does not implement registration or heartbeat."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:239
+#, python-format
+msgid "Matchmaker unregistered: %s, %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:250
+msgid "Register before starting heartbeat."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:343
+#: nova/openstack/common/rpc/matchmaker.py:361
+#, python-format
+msgid "No key defining hosts for topic '%s', see ringfile"
+msgstr ""
+
+#: nova/scheduler/chance.py:56
+msgid "Is the appropriate service running?"
+msgstr ""
+
+#: nova/scheduler/chance.py:61
+msgid "Could not find another compute"
+msgstr ""
+
+#: nova/scheduler/driver.py:57
+msgid "Exception during scheduler.run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
+
+#: nova/scheduler/driver.py:150
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:158
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:163
+msgid "Driver must implement select_hosts"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:76
+#, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:80
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:100
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:242
+msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:259
+#, python-format
+msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:291
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:359
+#, python-format
+msgid "Filtered %(hosts)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:364
+#, python-format
+msgid "Weighed %(hosts)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:417
+#, python-format
+msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:308
+#, python-format
+msgid "Host filter ignoring hosts: %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:320
+#, python-format
+msgid "Host filter forcing available hosts to %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:323
+#, python-format
+msgid "No hosts matched due to not matching 'force_hosts' value of '%s'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:336
+#, python-format
+msgid "Host filter forcing available nodes to %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:339
+#, python-format
+msgid "No nodes matched due to not matching 'force_nodes' value of '%s'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:379
+#, python-format
+msgid "Ignoring %(service_name)s service update from %(host)s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:385
+#, python-format
+msgid "Received %(service_name)s service update from %(state_key)s."
+msgstr ""
+
+#: nova/scheduler/host_manager.py:405
+#: nova/scheduler/filters/trusted_filter.py:214
+#, python-format
+msgid "No service for compute ID %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:427
+#, python-format
+msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:71
+#, python-format
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:80
+#, python-format
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
+
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
+#: nova/scheduler/filters/affinity_filter.py:95
+#, python-format
+msgid "Group affinity: %(host)s in %(configured)s"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_instance_extra_specs.py:49
+#, python-format
+msgid ""
+"%(host_state)s fails instance_type extra_specs requirements. Extra_spec "
+"%(key)s is not in aggregate."
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_instance_extra_specs.py:57
+#, python-format
+msgid ""
+"%(host_state)s fails instance_type extra_specs requirements. "
+"'%(aggregate_vals)s' do not match '%(req)s'"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
+#, python-format
+msgid "%s fails tenant id on aggregate"
+msgstr ""
+
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:40
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:44
+#, python-format
+msgid "%(host_state)s is disabled via capabilities"
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:50
+msgid "VCPUs not set; assuming CPU collection broken"
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/filters/disk_filter.py:47
+#, python-format
+msgid ""
+"%(host_state)s does not have %(requested_disk)s MB usable disk, it only "
+"has %(usable_disk_mb)s MB usable disk."
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:48
+#, python-format
+msgid ""
+"Instance contains properties %(image_props)s, but no corresponding "
+"capabilities are advertised by the compute node"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:61
+#, python-format
+msgid ""
+"Instance properties %(image_props)s are satisfied by compute host "
+"capabilities %(capabilities)s"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:68
+#, python-format
+msgid ""
+"Instance contains properties %(image_props)s that are not provided by the"
+" compute node capabilities %(capabilities)s"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:86
+#, python-format
+msgid "%(host_state)s does not support requested instance_properties"
+msgstr ""
+
+#: nova/scheduler/filters/io_ops_filter.py:42
+#, python-format
+msgid ""
+"%(host_state)s fails I/O ops check: Max IOs per host is set to "
+"%(max_io_ops)s"
+msgstr ""
+
+#: nova/scheduler/filters/num_instances_filter.py:39
+#, python-format
+msgid ""
+"%(host_state)s fails num_instances check: Max instances per host is set "
+"to %(max_instances)s"
+msgstr ""
+
+#: nova/scheduler/filters/ram_filter.py:55
+#, python-format
+msgid ""
+"%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
+" %(usable_ram)s MB usable ram."
+msgstr ""
+
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/filters/retry_filter.py:41
+#, python-format
+msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
+msgstr ""
+
+#: nova/servicegroup/api.py:60
+#, python-format
+msgid "ServiceGroup driver defined as an instance of %s"
+msgstr ""
+
+#: nova/servicegroup/api.py:66
+#, python-format
+msgid "unknown ServiceGroup driver name: %s"
+msgstr ""
+
+#: nova/servicegroup/api.py:83
+#, python-format
+msgid ""
+"Join new ServiceGroup member %(member_id)s to the %(group_id)s group, "
+"service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/api.py:90
+#, python-format
+msgid "Check if the given member [%s] is part of the ServiceGroup, is up"
+msgstr ""
+
+#: nova/servicegroup/api.py:99
+#, python-format
+msgid ""
+"Explicitly remove the given member %(member_id)s from the%(group_id)s "
+"group monitoring"
+msgstr ""
+
+#: nova/servicegroup/api.py:106
+#, python-format
+msgid "Returns ALL members of the [%s] ServiceGroup"
+msgstr ""
+
+#: nova/servicegroup/api.py:114
+#, python-format
+msgid "Returns one member of the [%s] group"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:41
+#, python-format
+msgid ""
+"DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
+" group, service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:45
+msgid "service is a mandatory argument for DB based ServiceGroup driver"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:72
+#, python-format
+msgid "DB_Driver: get_all members of the %s group"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
+msgid "Recovered model server connection!"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
+msgid "model server went away"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:43
+msgid "memcached_servers not defined"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:51
+#, python-format
+msgid ""
+"Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
+"%(group_id)s group, service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:56
+msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:74
+#, python-format
+msgid "Memcached_Driver: get_all members of the %s group"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:80
+#, python-format
+msgid ""
+"ZooKeeperDriver: join new member %(id)s to the %(gr)s group, "
+"service=%(sr)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:90
+msgid ""
+"Unable to join. It is possible that either another node exists with the "
+"same name, or this node just restarted. We will try again in a short "
+"while to make sure."
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:101
+#, python-format
+msgid "ZooKeeperDriver.leave: %(member)s from group %(group)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:109
+#, python-format
+msgid "ZooKeeperDriver.leave: %(id)s has not joined to the %(gr)s group"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:71
+#, python-format
+msgid "Trying (%(tries)s) to remove device %(device)s"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:101
+#, python-format
+msgid "Multipath call failed exit (%(code)s)"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:122
+#, python-format
+msgid "Couldn't find multipath device %(line)s"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:126
+#, python-format
+msgid "Found multipath device = %(mdev)s"
+msgstr ""
+
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:71
+#, python-format
+msgid "Faking execution of cmd (subprocess): %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:79
+#, python-format
+msgid "Faked command matched %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:95
+#, python-format
+msgid "Faked command raised an exception %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:100
+#, python-format
+msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
+msgstr ""
+
+#: nova/tests/fake_volume.py:188
+msgid "status must be available"
+msgstr ""
+
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
+msgid "already attached"
+msgstr ""
+
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
+msgid "Instance and volume not in same availability_zone"
+msgstr ""
+
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
+msgid "already detached"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:79
+msgid "200 Role Match"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:81
+msgid "200 No Roles"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:84
+msgid "unexpected role header"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3504
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
+msgid ""
+"Quota exceeded for instances: Requested 1, but already used 10 of 10 "
+"instances"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3509
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
+msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3514
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
+msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1239
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
+#, python-format
+msgid "Running instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
+#, python-format
+msgid "After terminating instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1949
+msgid "Internal error"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:4271
+#, python-format
+msgid "After force-killing instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:4782
+msgid "wrong host/node"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:9713
+msgid "spawn error"
+msgstr ""
+
+#: nova/tests/db/test_migrations.py:1805
+#, python-format
+msgid ""
+"The following migrations are missing a downgrade:\n"
+"\t%s"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:183
+#, python-format
+msgid "%(result_str)s: %(result)s is not a dict."
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:197
+#, python-format
+msgid ""
+"Dictionary key mismatch:\n"
+"Extra key(s) in template:\n"
+"%(ex_delta)s\n"
+"Extra key(s) in %(result_str)s:\n"
+"%(res_delta)s\n"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:208
+#, python-format
+msgid "%(result_str)s: %(result)s is not a list."
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:227
+msgid "Extra list items in template:"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:231
+#, python-format
+msgid "Extra list items in %(result_str)s:"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
+#, python-format
+msgid ""
+"Values do not match:\n"
+"Template: %(expected)s\n"
+"%(result_str)s: %(result)s"
+msgstr ""
+
+#: nova/tests/integrated/test_login.py:31
+#, python-format
+msgid "flavor: %s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:38
+#, python-format
+msgid ""
+"%(message)s\n"
+"Status Code: %(_status)s\n"
+"Body: %(_body)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:47
+msgid "Authentication error"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:55
+msgid "Authorization error"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:63
+msgid "Item not found"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:105
+#, python-format
+msgid "Doing %(method)s on %(relative_url)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:107
+#, python-format
+msgid "Body: %s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:125
+#, python-format
+msgid "%(auth_uri)s => code %(http_status)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:155
+#, python-format
+msgid "%(relative_uri)s => code %(http_status)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:165
+msgid "Unexpected status code"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:172
+#, python-format
+msgid "Decoding JSON: %s"
+msgstr ""
+
+#: nova/tests/virt/hyperv/test_hypervapi.py:433
+msgid "fake vswitch not found"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
+#: nova/tests/virt/xenapi/test_vm_utils.py:370
+#: nova/virt/xenapi/vm_utils.py:2181
+#, python-format
+msgid ""
+"Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
+"left to copy"
+msgstr ""
+
+#: nova/tests/virt/xenapi/test_xenapi.py:900
+#, python-format
+msgid "Creating files in %s to simulate guest agent"
+msgstr ""
+
+#: nova/tests/virt/xenapi/test_xenapi.py:911
+#, python-format
+msgid "Removing simulated guest agent files in %s"
+msgstr ""
+
+#: nova/virt/configdrive.py:97
+#, python-format
+msgid "Added %(filepath)s to config drive"
+msgstr ""
+
+#: nova/virt/driver.py:949
+msgid "Event must be an instance of nova.virt.event.Event"
+msgstr ""
+
+#: nova/virt/driver.py:955
+#, python-format
+msgid "Exception dispatching event %(event)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/driver.py:977
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/virt/driver.py:980
+#, python-format
+msgid "Loading compute driver '%s'"
+msgstr ""
+
+#: nova/virt/driver.py:987
+msgid "Unable to load the virtualization driver"
+msgstr ""
+
+#: nova/virt/fake.py:212
+#, python-format
+msgid "Key '%(key)s' not in instances '%(inst)s'"
+msgstr ""
+
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr ""
+
+#: nova/virt/firewall.py:200
+msgid "Filters added to instance"
+msgstr ""
+
+#: nova/virt/firewall.py:202
+msgid "Provider Firewall Rules refreshed"
+msgstr ""
+
+#: nova/virt/firewall.py:383
+#, python-format
+msgid "Adding security group rule: %r"
+msgstr ""
+
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
+#, python-format
+msgid "Adding provider rule: %s"
+msgstr ""
+
+#: nova/virt/images.py:114
+msgid "Snapshot list encountered but no header found!"
+msgstr ""
+
+#: nova/virt/images.py:203
+msgid "'qemu-img info' parsing failed."
+msgstr ""
+
+#: nova/virt/images.py:209
+#, python-format
+msgid "fmt=%(fmt)s backed by: %(backing_file)s"
+msgstr ""
+
+#: nova/virt/images.py:221
+#, python-format
+msgid "Converted to raw, but format is now %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:90
+#, python-format
+msgid "Request for baremetal node %s sent to wrong service host"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:143
+msgid "cpu_arch is not found in instance_type_extra_specs"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:185
+#, python-format
+msgid "Baremetal node id not supplied to driver for %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:259
+#, python-format
+msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:286
+#, python-format
+msgid "Baremetal power manager failed to restart node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:297
+#, python-format
+msgid "Destroy called on non-existing instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:315
+#, python-format
+msgid "Error from baremetal driver during destroy: %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:320
+#, python-format
+msgid "Error while recording destroy failure in baremetal database: %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:330
+#, python-format
+msgid "Baremetal power manager failed to stop node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:343
+#, python-format
+msgid "Baremetal power manager failed to start node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:86
+#, python-format
+msgid "pid file %s does not contain any pid"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:109
+msgid "Node id not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:112
+msgid "Address not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:115
+msgid "User not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:118
+msgid "Password not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:135
+#, python-format
+msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:157
+msgid "IPMI power on failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:179
+msgid "IPMI power off failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:189
+msgid "IPMI set next bootdev failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
+#, python-format
+msgid "Activate node called, but node %s is already active"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:109
+#, python-format
+msgid "Building PXE config for deployment %s."
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:228
+#, python-format
+msgid ""
+"Can not activate PXE bootloader. The following boot parameters were not "
+"passed to baremetal driver: %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
+#, python-format
+msgid "Fetching kernel and ramdisk for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
+#, python-format
+msgid "Fetching image %(ami)s for instance %(name)s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
+#, python-format
+msgid "Injecting files into image for instance %(name)s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
+#, python-format
+msgid "Node associated with another instance while waiting for deploy of %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:464
+#, python-format
+msgid "PXE deploy started for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:469
+#, python-format
+msgid "PXE deploy completed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:473
+#, python-format
+msgid "PXE deploy failed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
+#, python-format
+msgid "Baremetal node deleted while waiting for deployment of instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:480
+#, python-format
+msgid "Timeout reached while waiting for PXE deploy of instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:121
+#, python-format
+msgid ""
+"Can not activate Tilera bootloader. The following boot parameters were "
+"not passed to baremetal driver: %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:338
+#, python-format
+msgid "Tilera deploy started for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:344
+#, python-format
+msgid "Tilera deploy completed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:352
+msgid "Node is unknown error state."
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:355
+#, python-format
+msgid "Tilera deploy failed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:83
+msgid "Node id not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:86
+msgid "Address not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:89
+msgid "User not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:92
+msgid "Password not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:117
+msgid "PDU failed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:134
+msgid "PDU power on failed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:147
+msgid "PDU power off failed"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:41
+#, python-format
+msgid "Failed to inject data into image %(image)s. Error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:52
+#, python-format
+msgid "Failed to unlink %(path)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:60
+#, python-format
+msgid "Failed to remove dir %(path)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:75
+#, python-format
+msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:37
+#, python-format
+msgid "plug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:50
+#, python-format
+msgid "pif:%(id)s is plugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:57
+#, python-format
+msgid ""
+"Baremetal node: %(id)s has no available physical interface for virtual "
+"interface %(vif_uuid)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:63
+#, python-format
+msgid "unplug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:71
+#, python-format
+msgid "pif:%(id)s is unplugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:75
+#, python-format
+msgid "no pif for vif_uuid=%s"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:109
+msgid "virtual_power_ssh_host not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:113
+msgid "virtual_power_host_user not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:119
+msgid "virtual_power_host_pass/key not set. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:123
+#, python-format
+msgid "baremetal driver was unable to delete tid %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:187
+#, python-format
+msgid "Could not determine iscsi initiator name for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:227
+#, python-format
+msgid "No fixed PXE IP is associated to %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:260
+#, python-format
+msgid "detach volume could not find tid for %s"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:199
+msgid "instance_uuid must be supplied to bm_node_associate_and_update"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:211
+#, python-format
+msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
+#, python-format
+msgid "Baremetal interface %s not found"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
+#, python-format
+msgid "Baremetal interface %s already in use"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
+#, python-format
+msgid "Baremetal virtual interface %s not found"
+msgstr ""
+
+#: nova/virt/disk/api.py:133
+#, python-format
+msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:140
+#, python-format
+msgid "Cannot resize filesystem %s to a smaller size."
+msgstr ""
+
+#: nova/virt/disk/api.py:151
+#, python-format
+msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
+msgstr ""
+
+#: nova/virt/disk/api.py:161
+#, python-format
+msgid ""
+"Unable to determine label for image %(image)s with error %(errror)s. "
+"Cannot resize."
+msgstr ""
+
+#: nova/virt/disk/api.py:228
+msgid "image already mounted"
+msgstr ""
+
+#: nova/virt/disk/api.py:284
+#, python-format
+msgid ""
+"Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:302
+#, python-format
+msgid "Ignoring error injecting data into image (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:321
+#, python-format
+msgid ""
+"Failed to mount container filesystem '%(image)s' on '%(target)s': "
+"%(errors)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:338
+#, python-format
+msgid "Failed to teardown ntainer filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:351
+#, python-format
+msgid "Failed to umount container filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:376
+#, python-format
+msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:388
+#, python-format
+msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:397
+#, python-format
+msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:438
+#, python-format
+msgid "Inject key fs=%(fs)s key=%(key)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:466
+#, python-format
+msgid "Inject key fs=%(fs)s net=%(net)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:491
+#, python-format
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
+msgstr ""
+
+#: nova/virt/disk/api.py:535
+msgid "Not implemented on Windows"
+msgstr ""
+
+#: nova/virt/disk/api.py:564
+#, python-format
+msgid "User %(username)s not found in password file."
+msgstr ""
+
+#: nova/virt/disk/api.py:580
+#, python-format
+msgid "User %(username)s not found in shadow file."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:41
+#, python-format
+msgid ""
+"Instance for format imgfile=%(imgfile)s mountdir=%(mountdir)s "
+"partition=%(partition)s imgfmt=%(imgfmt)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
+#: nova/virt/disk/vfs/localfs.py:68
+msgid "Using LoopMount"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
+#: nova/virt/disk/vfs/localfs.py:73
+msgid "Using NbdMount"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:57
+#, python-format
+msgid ""
+"Instance for device imgfile=%(imgfile)s mountdir=%(mountdir)s "
+"partition=%(partition)s device=%(device)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:117
+msgid "Device allocation failed. Will retry in 2 seconds."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:120
+msgid "Device allocation failed after repeated retries."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:135
+#, python-format
+msgid "Map dev %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:140
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:156
+#, python-format
+msgid "partition %s not found"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:157
+#, python-format
+msgid "Failed to map partitions: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:179
+#, python-format
+msgid "Unmap dev %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:187
+#, python-format
+msgid "Mount %(dev)s on %(dir)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:192
+#, python-format
+msgid "Failed to mount filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:203
+#, python-format
+msgid "Umount %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:214
+msgid "Fail to mount, tearing back down"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:33
+#, python-format
+msgid "Could not attach image to loopback: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:34
+#, python-format
+msgid "Loop mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:40
+#, python-format
+msgid "Got loop device %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:58
+#, python-format
+msgid "Release loop device %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:55 nova/virt/disk/mount/nbd.py:69
+msgid "No free nbd devices"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:60
+msgid "nbd module not loaded"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:61
+msgid "nbd unavailable: module not loaded"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:86
+#, python-format
+msgid "Get nbd device %(dev)s for %(imgfile)s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:91
+#, python-format
+msgid "qemu-nbd error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:92 nova/virt/disk/mount/nbd.py:105
+#, python-format
+msgid "NBD mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:104
+#, python-format
+msgid "nbd device %s did not show up"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:111
+#, python-format
+msgid "Detaching from erroneous nbd device returned error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:126
+#, python-format
+msgid "Release nbd device %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:27
+#, python-format
+msgid ""
+"Instance for image imgfile=%(imgfile)s imgfmt=%(imgfmt)s "
+"partition=%(partition)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:32
+msgid "Trying to import guestfs"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:39
+msgid "Using primary VFSGuestFS"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:44
+msgid "Falling back to VFSLocalFS"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:55
+#, python-format
+msgid "Mount guest OS image %(imgfile)s partition %(part)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:64
+#, python-format
+msgid "Inspecting guest OS image %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:68
+#, python-format
+msgid "No operating system found in %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:72
+#, python-format
+msgid "Multi-boot OS %(roots)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:74
+#, python-format
+msgid "Multi-boot operating system found in %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:80
+#, python-format
+msgid "Inspecting guest OS root filesystem %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:85
+#, python-format
+msgid "No mount points found in %(root)s of %(imgfile)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:90
+#, python-format
+msgid "Mounting %(dev)s at %(dir)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:95
+#, python-format
+msgid "Setting up appliance for %(imgfile)s %(imgfmt)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:113
+#, python-format
+msgid "Error mounting %(imgfile)s with libguestfs (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:120
+msgid "Tearing down appliance"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:126
+#, python-format
+msgid "Failed to close augeas %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:134
+#, python-format
+msgid "Failed to shutdown appliance %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:142
+#, python-format
+msgid "Failed to close guest handle %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:154 nova/virt/disk/vfs/localfs.py:102
+#, python-format
+msgid "Make directory path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:159 nova/virt/disk/vfs/localfs.py:107
+#, python-format
+msgid "Append file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:164 nova/virt/disk/vfs/localfs.py:116
+#, python-format
+msgid "Replace file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:169 nova/virt/disk/vfs/localfs.py:125
+#, python-format
+msgid "Read file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:174 nova/virt/disk/vfs/localfs.py:131
+#, python-format
+msgid "Has file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:183
+#, python-format
+msgid "Set permissions path=%(path)s mode=%(mode)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:188
+#, python-format
+msgid "Set ownership path=%(path)s user=%(user)s group=%(group)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:201
+#, python-format
+msgid "chown uid=%(uid)d gid=%(gid)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:47
+#, python-format
+msgid "File path %s not valid"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:82
+#, python-format
+msgid "Failed to mount image %(ex)s)"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:90
+#, python-format
+msgid "Failed to unmount %(imgdir)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:96
+#, python-format
+msgid "Failed to remove %(imgdir)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:139
+#, python-format
+msgid "Set permissions path=%(path)s mode=%(mode)o"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:144
+#, python-format
+msgid "Set permissions path=%(path)s user=%(user)s group=%(group)s"
+msgstr ""
+
+#: nova/virt/hyperv/basevolumeutils.py:71
+msgid "The ISCSI initiator name can't be found. Choosing the default one"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:151
+msgid "plug_vifs called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:154
+msgid "unplug_vifs called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:157
+msgid "ensure_filtering_rules_for_instance called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:161
+msgid "unfilter_instance called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:192
+msgid "get_console_output called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:93
+#, python-format
+msgid "Windows version: %s "
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:105
+msgid "get_available_resource called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
+#: nova/virt/xenapi/host.py:148
+msgid "Updating host stats"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:161
+msgid "get_host_stats called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:176
+#, python-format
+msgid "Host IP address is: %s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:49
+#, python-format
+msgid "The image is not a valid VHD: %s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:69
+#, python-format
+msgid ""
+"Cannot resize the image to a size smaller than the VHD max. internal "
+"size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:84
+#, python-format
+msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:87
+#, python-format
+msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:45
+msgid "live_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:55
+#, python-format
+msgid "Calling live migration recover_method for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:59
+#, python-format
+msgid "Calling live migration post_method for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:65
+msgid "pre_live_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:78
+msgid "post_live_migration_at_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:85
+msgid "check_can_live_migrate_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:90
+msgid "check_can_live_migrate_destination_cleanup called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:94
+msgid "check_can_live_migrate_source called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:43
+#, python-format
+msgid "Live migration is not supported on target host \"%s\""
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:46
+#, python-format
+msgid "Target live migration host \"%s\" is unreachable"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:49
+#, python-format
+msgid "Live migration failed: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:61
+msgid "Live migration is not enabled on this host"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:64
+msgid "Live migration networks are not configured on this host"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:70 nova/virt/hyperv/vmutils.py:103
+#, python-format
+msgid "VM not found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:72 nova/virt/hyperv/vmutils.py:112
+#, python-format
+msgid "Duplicate VM name found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:77
+#, python-format
+msgid "Destroying existing remote planned VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:99
+#, python-format
+msgid "Creating remote planned VM for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:156
+#, python-format
+msgid ""
+"Replacing host resource %(old_disk_path)s with %(new_disk_path)s on "
+"planned VM %(vm_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:163
+#, python-format
+msgid "Updating remote planned VM disk paths for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:199
+#, python-format
+msgid "Starting live migration for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:208
+#, python-format
+msgid "Getting live migration networks for remote host: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:50
+msgid "Migration target is the source host"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:52
+#, python-format
+msgid "Migration target host: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:73
+#, python-format
+msgid "Copying disk \"%(disk_file)s\" to \"%(dest_path)s\""
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:96
+msgid "Cannot cleanup migration files"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:103
+#, python-format
+msgid ""
+"Cannot resize the root disk to a smaller size. Current size: "
+"%(curr_root_gb)s GB. Requested size: %(new_root_gb)s GB"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:113
+msgid "migrate_disk_and_power_off called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:133
+msgid "confirm_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:148
+msgid "finish_revert_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:167
+#, python-format
+msgid "Copying base disk %(base_vhd_path)s to %(base_vhd_copy_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:171
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(base_vhd_copy_path)s and diff VHD "
+"%(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:177
+#, python-format
+msgid "Merging base disk %(base_vhd_copy_path)s and diff disk %(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:189
+#, python-format
+msgid "Getting info for disk: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:194
+#, python-format
+msgid "Resizing disk \"%(vhd_path)s\" to new max size %(new_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:205
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(base_vhd_path)s and diff VHD "
+"%(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:214
+msgid "finish_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:223
+#, python-format
+msgid "Cannot find boot VHD file: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:236 nova/virt/hyperv/vmops.py:136
+msgid "Cannot resize a VHD to a smaller size"
+msgstr ""
+
+#: nova/virt/hyperv/networkutils.py:46
+#, python-format
+msgid "vswitch \"%s\" not found"
+msgstr ""
+
+#: nova/virt/hyperv/networkutils.py:59
+#, python-format
+msgid "Failed to create vswitch port %(port_name)s on switch %(vswitch_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:71
+#, python-format
+msgid "The file copy from %(src)s to %(dest)s failed"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:92
+#, python-format
+msgid "Creating directory: %s"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
+#, python-format
+msgid "Removing directory: %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:56
+#, python-format
+msgid "Creating snapshot for instance %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:65
+#, python-format
+msgid "Getting info for VHD %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:73
+#, python-format
+msgid "Copying VHD %(src_vhd_path)s to %(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:83
+#, python-format
+msgid "Copying base disk %(src_vhd_path)s to %(dest_base_disk_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:88
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(dest_base_disk_path)s and diff VHD "
+"%(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:94
+#, python-format
+msgid "Merging base disk %(dest_base_disk_path)s and diff disk %(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:99
+#, python-format
+msgid ""
+"Updating Glance image %(image_id)s with content from merged disk "
+"%(image_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:105
+#, python-format
+msgid "Snapshot image %(image_id)s updated for VM %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:109
+#, python-format
+msgid "Removing snapshot %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:113
+#, python-format
+msgid "Failed to remove snapshot for VM %s"
+msgstr ""
+
+#: nova/virt/hyperv/vif.py:75
+#, python-format
+msgid "Creating vswitch port for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:91
+#, python-format
+msgid "VIF driver not found for network_api_class: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:100
+msgid "get_info called for instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:121
+#, python-format
+msgid ""
+"Creating differencing VHD. Parent: %(base_vhd_path)s, Target: "
+"%(root_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:127
+#, python-format
+msgid "Copying VHD image %(base_vhd_path)s to target: %(root_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:139
+#, python-format
+msgid "Resizing VHD %(root_vhd_path)s to new size %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:152
+msgid "Spawning new instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:178
+msgid "Spawn instance failed"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:203
+#, python-format
+msgid "Creating nic for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:211
+#, python-format
+msgid "Invalid config_drive_format \"%s\""
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:214
+#, python-format
+msgid "Using config drive for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
+#, python-format
+msgid "Creating config drive at %(path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
+#, python-format
+msgid "Creating config drive failed with error: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:271
+#, python-format
+msgid "Got request to destroy instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:284
+#, python-format
+msgid "Instance not found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:290
+#, python-format
+msgid "Failed to destroy instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:295
+msgid "reboot instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:301
+msgid "Pause instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:307
+msgid "Unpause instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:313
+msgid "Suspend instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:319
+msgid "Resume instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:325
+msgid "Power off instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:331
+msgid "Power on instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:338
+#, python-format
+msgid "Successfully changed state of VM %(vm_name)s to: %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:342
+#, python-format
+msgid "Failed to change vm state of %(vm_name)s to %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:83
+#, python-format
+msgid "Cannot get VM summary data for: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:160
+#, python-format
+msgid "Creating VM %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:169
+#, python-format
+msgid "Setting memory for vm %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:172
+#, python-format
+msgid "Set vCPUs for vm %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:270
+msgid "Controller not found"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:332
+#, python-format
+msgid "Successfully changed vm state of %(vm_name)s to %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:373
+#, python-format
+msgid "Operation failed with return value: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:391
+#, python-format
+msgid ""
+"WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
+" - %(err_desc)s - Error code: %(err_code)d"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:399
+#, python-format
+msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:403
+#, python-format
+msgid "WMI job failed with status %(job_state)d. No error description available"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:409
+#, python-format
+msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:98
+#, python-format
+msgid ""
+"Already logged in on storage target. No need to login. Portal: "
+"%(target_portal)s, IQN: %(target_iqn)s, LUN: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:102
+#, python-format
+msgid ""
+"Logging in on storage target. Portal: %(target_portal)s, IQN: "
+"%(target_iqn)s, LUN: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:115
+#, python-format
+msgid "Attach_volume: %(connection_info)s to %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:145
+#, python-format
+msgid "Attach volume failed: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:147
+#, python-format
+msgid "Unable to attach volume to instance %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:160
+#, python-format
+msgid "Logging off storage target %(target_iqn)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:165
+#, python-format
+msgid "Detach_volume: %(connection_info)s from %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:176
+#, python-format
+msgid "Detaching physical disk from instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
+msgid "Could not determine iscsi initiator name"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:198 nova/virt/hyperv/volumeops.py:211
+#, python-format
+msgid "Unable to find a mounted disk for target_iqn: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:200
+#, python-format
+msgid "Device number: %(device_number)s, target lun: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeutils.py:51
+#, python-format
+msgid "An error has occurred when calling the iscsi initiator: %s"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:129
+#, python-format
+msgid "Unable to determine disk prefix for %s"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:177
+#, python-format
+msgid "No free disk device names for prefix '%s'"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:269
+#, python-format
+msgid "Unable to determine disk bus for '%s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:354
+#, python-format
+msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:565
+#, python-format
+msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:579
+#, python-format
+msgid "Connecting to libvirt: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:597
+#, python-format
+msgid "URI %s does not support events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:607
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:617
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:630
+msgid "Connection to libvirt broke"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
+#, python-format
+msgid "Can not handle authentication request for %d credentials"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:673
+#, python-format
+msgid "Connection to libvirt failed: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:782
+#, python-format
+msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:798
+msgid "During wait destroy, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:803
+msgid "Instance destroyed successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:813
+msgid "Instance may be started again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:823
+msgid "Going to destroy instance again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:842
+msgid "Error from libvirt during undefineFlags. Retrying with undefine"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:858
+#, python-format
+msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:878
+msgid "Instance may be still running, destroy it again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:884
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:913
+#, python-format
+msgid "Deleting instance files %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:922
+#, python-format
+msgid "Failed to cleanup directory %(target)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:965
+msgid "Could not determine fibre channel world wide node names"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:972
+msgid "Could not determine fibre channel world wide port names"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1096
+msgid "During detach_volume, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1120
+msgid "attaching network adapter failed."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1140
+msgid "During detach_interface, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1144
+msgid "detaching network adapter failed."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1242
+msgid "Beginning live snapshot process"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1245
+msgid "Beginning cold snapshot process"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1274
+msgid "Snapshot extracted, beginning image upload"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1286
+msgid "Snapshot image upload complete"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1352
+msgid "Instance soft rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1356
+msgid "Failed to soft reboot instance."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1394
+msgid "Instance shutdown successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1402
+msgid "Instance may have been rebooted during soft reboot, so return now."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1451
+msgid "Instance rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1597
+msgid "Instance is running"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
+msgid "Instance spawned successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1620
+#, python-format
+msgid "data: %(data)r, fpath: %(fpath)r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
+#, python-format
+msgid "Truncated console log returned, %d bytes ignored"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
+msgid "Guest does not have a console available"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1742
+#, python-format
+msgid "Path '%(path)s' supports direct I/O"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1746
+#, python-format
+msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
+#, python-format
+msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1827
+msgid "Creating image"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1928
+msgid "Using config drive"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1981
+#, python-format
+msgid "Injecting %(inj)s into image %(img_id)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1993
+#, python-format
+msgid "Error injecting data into image %(img_id)s (%(e)s)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2053
+#, python-format
+msgid ""
+"Config requested an explicit CPU model, but the current libvirt "
+"hypervisor '%s' does not support selecting CPU models"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2059
+msgid "Config requested a custom CPU model, but no model name was provided"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2063
+msgid "A CPU model name should not be set when a host CPU model is requested"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2067
+#, python-format
+msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2083
+msgid ""
+"Passthrough of the host CPU was requested but this libvirt version does "
+"not support this feature"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2407
+#, python-format
+msgid ""
+"Start to_xml instance=%(instance)s network_info=%(network_info)s "
+"disk_info=%(disk_info)s image_meta=%(image_meta)s "
+"rescue=%(rescue)sblock_device_info=%(block_device_info)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2424
+#, python-format
+msgid "End to_xml instance=%(instance)s xml=%(xml)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2442
+#, python-format
+msgid ""
+"Error from libvirt while looking up %(instance_id)s: [Error Code "
+"%(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2463
+#, python-format
+msgid ""
+"Error from libvirt while looking up %(instance_name)s: [Error Code "
+"%(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
+#, python-format
+msgid "Invalid range expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2679
+#, python-format
+msgid "Invalid exclusion expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2686
+#, python-format
+msgid "Invalid inclusion expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2691
+#, python-format
+msgid "No CPUs available after parsing %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2708
+msgid ""
+"Cannot get the number of cpu, because this function is not implemented "
+"for this platform. "
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2718
+msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2770
+#, python-format
+msgid "couldn't obtain the vpu count from domain id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2842
+msgid "libvirt version is too old (does not support getVersion)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2927
+#, python-format
+msgid "Trying to get stats for the volume %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2940
+#, python-format
+msgid ""
+"Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
+"rd_req=%(rd_req)d, rd_bytes=%(rd_bytes)d, wr_req=%(wr_req)d, "
+"wr_bytes=%(wr_bytes)d"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2958
+#, python-format
+msgid ""
+"Getting block stats failed, device might have been detached. "
+"Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2964
+#, python-format
+msgid ""
+"Could not find domain in libvirt for instance %s. Cannot get block stats "
+"for device"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3041
+#, python-format
+msgid ""
+"Creating tmpfile %s to verify with other compute node that the instance "
+"is on the same shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3122
+msgid "Block migration can not be used with shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3130
+msgid "Live migration can not be used without shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3174
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s: Disk of instance is too "
+"large(available on destination host:%(available)s < need:%(necessary)s)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3202
+#, python-format
+msgid ""
+"Instance launched has CPU info:\n"
+"%s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3214
+#, python-format
+msgid ""
+"CPU doesn't have compatibility.\n"
+"\n"
+"%(ret)s\n"
+"\n"
+"Refer to %(u)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3231
+#, python-format
+msgid ""
+"Creating tmpfile %s to notify to other compute nodes that they should "
+"mount the same storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3281
+#, python-format
+msgid "The firewall filter for %s does not exist"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3455
+#, python-format
+msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3568
+#, python-format
+msgid ""
+"Error from libvirt while getting description of %(instance_name)s: [Error"
+" Code %(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3600
+#, python-format
+msgid "skipping %s since it looks like volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3604
+#, python-format
+msgid "skipping disk for %s as it does not have a path"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3719
+msgid "Starting migrate_disk_and_power_off"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3788
+msgid "Instance running successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3794
+msgid "Starting finish_migration"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3859
+msgid "Starting finish_revert_migration"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3982
+#, python-format
+msgid "Checking instance files accessability %s"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:51
+msgid ""
+"Libvirt module could not be loaded. NWFilterFirewall will not work "
+"correctly."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:108
+msgid "Called setup_basic_filtering in nwfilter"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:116
+msgid "Ensuring static filters"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:248
+#, python-format
+msgid "The nwfilter(%s) is not found."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:270
+#, python-format
+msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:288
+msgid "iptables firewall: Setup Basic Filtering"
+msgstr ""
+
+#: nova/virt/libvirt/imagebackend.py:319
+msgid "You should specify libvirt_images_volume_group flag to use LVM images."
+msgstr ""
+
+#: nova/virt/libvirt/imagebackend.py:403
+#, python-format
+msgid "Unknown image_type=%s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:139
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:178
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:200
+#, python-format
+msgid "Writing stored info to %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:329
+#, python-format
+msgid "%s is a valid instance name"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:332
+#, python-format
+msgid "%s has a disk file"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:334
+#, python-format
+msgid "Instance %(instance)s is backed by %(backing)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:347
+#, python-format
+msgid ""
+"Instance %(instance)s is using a backing file %(backing)s which does not "
+"appear in the image service"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:422
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image verification failed"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:432
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): image verification skipped, no hash "
+"stored"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:441
+#, python-format
+msgid "%(id)s (%(base_file)s): generating checksum"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:456
+#, python-format
+msgid "Cannot remove %(base_file)s, it does not exist"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:468
+#, python-format
+msgid "Base file too young to remove: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:471
+#, python-format
+msgid "Removing base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:478
+#, python-format
+msgid "Failed to remove %(base_file)s, error was %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:489
+#, python-format
+msgid "image %(id)s at (%(base_file)s): checking"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:513
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
+"%(remote)d on other nodes sharing this instance storage"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:525
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): warning -- an absent base file is in "
+"use! instances: %(instance_list)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:537
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image is not in use"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:544
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image is in use"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:568
+#, python-format
+msgid "Skipping verification, no base directory at %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:572
+msgid "Verify base images"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:579
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:597
+#, python-format
+msgid "Unknown base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:602
+#, python-format
+msgid "Active base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:605
+#, python-format
+msgid "Corrupt base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:609
+#, python-format
+msgid "Removable base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:617
+msgid "Verification complete"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:77 nova/virt/libvirt/utils.py:83
+msgid "systool is not installed"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:87
+msgid "Cannot find any Fibre Channel HBAs"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:229
+#, python-format
+msgid ""
+"Insufficient Space on Volume Group %(vg)s. Only %(free_space)db "
+"available, but %(size)db required by volume %(lv)s."
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:242
+#, python-format
+msgid ""
+"Volume group %(vg)s will not be able to hold sparse volume %(lv)s. "
+"Virtual volume size is %(size)db, but free space on volume group is only "
+"%(free_space)db."
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:277
+#, python-format
+msgid "vg %s must be LVM volume group"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:306
+#, python-format
+msgid "Path %s must be LVM logical volume"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:572
+msgid "Can't retrieve root device path from instance libvirt configuration"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
+#, python-format
+msgid ""
+"vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
+"mapping=%(mapping)s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
+msgid "vif_type parameter must be present for this vif_driver implementation"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
+#, python-format
+msgid "Unexpected vif_type=%s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:338
+#, python-format
+msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:348
+#, python-format
+msgid "Ensuring bridge %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
+msgid "Failed while unplugging vif"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:624
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:651
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:680
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:709
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:736
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:240
+#, python-format
+msgid "iSCSI device not found at %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:243
+#, python-format
+msgid ""
+"ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
+"number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:256
+#, python-format
+msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
+#, python-format
+msgid "%s is already mounted"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:562
+#, python-format
+msgid "AoE device not found at %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:564
+#, python-format
+msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:579
+#, python-format
+msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:706
+msgid "We are unable to locate any Fibre Channel devices"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:715
+#, python-format
+msgid "Looking for Fibre Channel dev %(device)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:725
+msgid "Fibre Channel device not found."
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:728
+#, python-format
+msgid ""
+"Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
+"Try number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:745
+#, python-format
+msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:754
+#, python-format
+msgid "Multipath device discovered %(device)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:831
+msgid "Value required for 'scality_sofs_config'"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:842
+#, python-format
+msgid "Cannot access 'scality_sofs_config': %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:848
+msgid "Cannot execute /sbin/mount.sofs"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:863
+msgid "Cannot mount Scality SOFS, check syslog for errors"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:149
+#, python-format
+msgid "Removing the logical volume '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:167
+#, python-format
+msgid "Fetching image '%s' from glance"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:172
+#, python-format
+msgid "Using image found at '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:174
+#, python-format
+msgid "Ensuring image '%s' exists on IVM"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:186
+#, python-format
+msgid "Creating logical volume of size %s bytes"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:189
+#, python-format
+msgid "Copying image to the device '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:192
+msgid "Error while creating logical volume from image. Will attempt cleanup."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:200
+msgid "Error while attempting cleanup of failed deploy to logical volume."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:246
+msgid "Snapshot added to glance."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:252
+#, python-format
+msgid "Failed to clean up snapshot file %(snapshot_file_path)s"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:337
+msgid "Could not create logical volume. No space left on any volume group."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:437 nova/virt/powervm/blockdev.py:517
+msgid "Unable to get checksum"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:444 nova/virt/powervm/blockdev.py:533
+msgid "Image checksums do not match"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:469
+#, python-format
+msgid "Image found on host at '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:477
+msgid "Uncompressed image file not found"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:555 nova/virt/powervm/operator.py:677
+#, python-format
+msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:572 nova/virt/powervm/operator.py:694
+#, python-format
+msgid "Found error stream for command \"%(command)s\": %(error_text)s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:67
+msgid "Connection error connecting PowerVM manager"
+msgstr ""
+
+#: nova/virt/powervm/common.py:100
+#, python-format
+msgid "Running cmd (SSH-as-root): %s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:149
+msgid "File transfer to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/common.py:168
+#, python-format
+msgid "ftp GET %(remote_path)s to: %(local_path)s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:174
+msgid "File transfer from PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:125
+msgid "In get_host_ip_addr"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:128
+#, python-format
+msgid "Attempting to resolve %s"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:130
+#, python-format
+msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:171
+#, python-format
+msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:304
+#, python-format
+msgid "Unrecognized root disk information: %s"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:21
+msgid "Connection to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:25
+#, python-format
+msgid "File '%(file_path)s' transfer to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:29
+#, python-format
+msgid "FTP %(ftp_cmd)s from %(source_path)s to %(dest_path)s failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:33
+#, python-format
+msgid "LPAR instance '%(instance_name)s' could not be found"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:37
+#, python-format
+msgid "LPAR instance '%(instance_name)s' creation failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:41
+msgid "No space left on any volume group"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:49
+#, python-format
+msgid "Operation '%(operation)s' on LPAR '%(instance_name)s' timed out"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:54
+msgid "Image creation failed on PowerVM"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:58
+#, python-format
+msgid ""
+"Insufficient free memory on PowerVM system to spawn instance "
+"'%(instance_name)s'"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:63
+#, python-format
+msgid ""
+"Insufficient available CPUs on PowerVM system to spawn instance "
+"'%(instance_name)s'"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:68
+#, python-format
+msgid "PowerVM LPAR instance '%(instance_name)s' cleanup failed"
+msgstr ""
+
+#: nova/virt/powervm/lpar.py:55
+#, python-format
+msgid ""
+"Encountered unknown LPAR attribute: %s\n"
+"Continuing without storing"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:98
+#, python-format
+msgid "LPAR instance '%s' not found"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:186
+#, python-format
+msgid "PowerVM image creation failed: %s"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:200
+#, python-format
+msgid "Creating LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:202
+#, python-format
+msgid "LPAR instance '%s' creation failed"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:208
+#, python-format
+msgid "Activating the LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:225
+#, python-format
+msgid "Instance '%s' failed to boot"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:237
+msgid "Error while attempting to clean up failed instance launch."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:241
+#, python-format
+msgid "Instance spawned in %s seconds"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:252
+#, python-format
+msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:271
+#, python-format
+msgid "Stopping instance %s for snapshot."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:294
+#, python-format
+msgid "Shutting down the instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:299
+#, python-format
+msgid "Deleting the LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:311
+msgid "PowerVM instance cleanup failed"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
+msgid "Not enough free memory in the host"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
+msgid "Insufficient available CPU on PowerVM"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:138
+msgid ""
+"Must specify vmwareapi_host_ip,vmwareapi_host_username and "
+"vmwareapi_host_password to usecompute_driver=vmwareapi.VMwareESXDriver or"
+" vmwareapi.VMwareVCDriver"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:350
+#, python-format
+msgid "VMware Cluster %s is not found"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:453
+#, python-format
+msgid "In vmwareapi:_create_session, got this exception: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:536
+#, python-format
+msgid "In vmwareapi:_call_method, got this exception: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:572
+#, python-format
+msgid "Task [%(task_name)s] %(task_ref)s status: success"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:577
+#, python-format
+msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:581
+#, python-format
+msgid "In vmwareapi:_poll_task, Got this error %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:93
+#, python-format
+msgid "Error(s) %s occurred in the call to RetrieveProperties"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
+#, python-format
+msgid "%(text)s: _db_content => %(content)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:140
+#, python-format
+msgid "Property %(attr)s not set for the managed object %(name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:540
+msgid "There is no VM registered"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
+#, python-format
+msgid "Virtual Machine with ref %s is not there"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:605
+#, python-format
+msgid "Logging out a session that is invalid or already logged out: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:620
+msgid "Session is faulty"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:623
+msgid "Session Invalid"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:716
+msgid "No Virtual Machine has been registered yet"
+msgstr ""
+
+#: nova/virt/vmwareapi/host.py:40
+#, python-format
+msgid "%(action)s %(host)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/host.py:64
+#, python-format
+msgid "Set maintenance mod on %(host)s to %(mode)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:118
+#, python-format
+msgid "Glance image %s is in killed state"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:126
+#, python-format
+msgid "Glance image %(image_id)s is in unknown state - %(state)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:135
+msgid ""
+"ESX SOAP server returned an empty port group for the host system in its "
+"response"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:161
+#, python-format
+msgid "Creating Port Group with name %s on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:175
+#, python-format
+msgid "Created Port Group with name %s on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/read_write_util.py:145
+#, python-format
+msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:84
+msgid "Unable to import suds."
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:169
+#, python-format
+msgid "No such SOAP method '%s' provided by VI SDK"
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:174
+#, python-format
+msgid "httplib error in %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:181
+#, python-format
+msgid "Socket error in %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:186
+#, python-format
+msgid "Type error in  %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:190
+#, python-format
+msgid "Exception in %s "
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:92
+msgid "Getting list of instances"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:108
+#, python-format
+msgid "Got total of %s instances"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:199
+msgid "Creating VM on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:207
+msgid "Created VM on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:231
+#, python-format
+msgid ""
+"Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
+"type %(adapter_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:250
+#, python-format
+msgid ""
+"Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
+"%(disk_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:259
+#, python-format
+msgid ""
+"Deleting the file %(vmdk_path)s on the ESX host localstore "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:273
+#, python-format
+msgid ""
+"Deleted the file %(vmdk_path)s on the ESX host local store "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:281
+#, python-format
+msgid ""
+"Downloading image file data %(image_ref)s to the ESX data store "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:301
+#, python-format
+msgid ""
+"Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
+"ESX data store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:315
+#, python-format
+msgid ""
+"Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
+" %(adapter_type)s on the ESX host local store %(data_store_name)s to disk"
+" type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:336
+#, python-format
+msgid ""
+"Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
+"%(disk_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:415
+msgid "Powering on the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:421
+msgid "Powered on the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:464
+msgid "Creating Snapshot of the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:474
+msgid "Created Snapshot of the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:519
+msgid "Copying disk data before snapshot of the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:532
+msgid "Copied disk data before snapshot of the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:541
+#, python-format
+msgid "Uploading image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:555
+#, python-format
+msgid "Uploaded image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:568
+#, python-format
+msgid "Deleting temporary vmdk file %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:577
+#, python-format
+msgid "Deleted temporary vmdk file %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:606
+msgid "instance is not powered on"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:613
+msgid "Rebooting guest OS of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:616
+msgid "Rebooted guest OS of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:618
+msgid "Doing hard reboot of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:622
+msgid "Did hard reboot of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
+msgid "Destroying the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
+msgid "Destroyed the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:641
+#, python-format
+msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
+msgid "Powering off the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
+msgid "Powered off the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:684
+msgid "Unregistering the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:687
+msgid "Unregistered the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:689
+#, python-format
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while un-registering the "
+"VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:702
+#, python-format
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:714
+#, python-format
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:719
+#, python-format
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while deleting the VM "
+"contents from the disk: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:727
+msgid "pause not supported for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:731
+msgid "unpause not supported for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:742
+msgid "Suspending the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:746
+msgid "Suspended the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:749
+msgid "instance is powered off and cannot be suspended."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:752
+msgid "VM was already in suspended state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:762
+msgid "Resuming the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:767
+msgid "Resumed the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:769
+msgid "instance is not in a suspended state"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:829
+msgid "instance is suspended and cannot be powered off."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:832
+msgid "VM was already in powered off state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:843
+msgid "VM was already in powered on state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:847
+msgid "Powering on the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:852
+msgid "Powered on the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:872
+#, python-format
+msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:901
+#, python-format
+msgid "Renaming the VM to %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:907
+#, python-format
+msgid "Renamed the VM to %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:922
+#, python-format
+msgid "Cloning VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:930
+#, python-format
+msgid "Cloned VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:943
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:954
+#, python-format
+msgid ""
+"In vmwareapi:vmops:confirm_migration, got this exception while destroying"
+" the VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:970
+#, python-format
+msgid "Renaming the VM from %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:976
+#, python-format
+msgid "Renamed the VM from %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1001
+#, python-format
+msgid "Migrating VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1013
+#, python-format
+msgid "Migrated VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
+#, python-format
+msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1027
+#, python-format
+msgid "Automatically hard rebooting %d"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1061
+msgid "get_diagnostics not implemented for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1138
+msgid "Reconfiguring VM instance to set the machine id"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1144
+msgid "Reconfigured VM instance to set the machine id"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1156
+#, python-format
+msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1163
+#, python-format
+msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1256
+#, python-format
+msgid "Creating directory with path %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1262
+#, python-format
+msgid "Created directory with path %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:92
+#, python-format
+msgid "Downloading image %s from glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:108
+#, python-format
+msgid "Downloaded image %s from glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:114
+#, python-format
+msgid "Uploading image %s to the Glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:140
+#, python-format
+msgid "Uploaded image %s to the Glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:151
+#, python-format
+msgid "Getting image size for the image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:156
+#, python-format
+msgid "Got image size of %(size)s for the image %(image)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:163
+#, python-format
+msgid "Rescanning HBA %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:166
+#, python-format
+msgid "Rescanned HBA %s "
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:178 nova/virt/xenapi/volume_utils.py:267
+#, python-format
+msgid "Mountpoint cannot be translated: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:57
+#, python-format
+msgid ""
+"Reconfiguring VM instance %(instance_name)s to attach disk %(vmdk_path)s "
+"or device %(device_name)s with type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:65
+#, python-format
+msgid ""
+"Reconfigured VM instance %(instance_name)s to attach disk %(vmdk_path)s "
+"or device %(device_name)s with type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:77
+#, python-format
+msgid "Reconfiguring VM instance %(instance_name)s to detach disk %(disk_key)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:84
+#, python-format
+msgid "Reconfigured VM instance %(instance_name)s to detach disk %(disk_key)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:91
+#, python-format
+msgid "Discovering iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:96
+msgid "Storage target found. No need to discover"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:104
+#, python-format
+msgid "Discovered iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:107
+#, python-format
+msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:127
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:138 nova/virt/vmwareapi/volumeops.py:177
+msgid "Unable to find iSCSI Target"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
+#, python-format
+msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
+#, python-format
+msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:185
+msgid "Unable to find volume"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
+#, python-format
+msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
+#, python-format
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
+#, python-format
+msgid ""
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
+#, python-format
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:122
+#, python-format
+msgid ""
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:129
+#, python-format
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:155
+msgid "Querying agent version"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:174
+#, python-format
+msgid "Updating agent to %s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:183
+#, python-format
+msgid "Unable to update the agent due to: %(exc)s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:215
+msgid "Setting admin password"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:231
+msgid "Skipping setting of ssh key for Windows."
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:247
+#, python-format
+msgid "Injecting file path: %r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:257
+msgid "Resetting network"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:279
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:287
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:291
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:305
+msgid "Invalid 'agent_present' value. Falling back to the default."
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:358
+#, python-format
+msgid "OpenSSL error: %s"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:134
+msgid ""
+"Must specify xenapi_connection_url, xenapi_connection_username "
+"(optionally), and xenapi_connection_password to use "
+"compute_driver=xenapi.XenAPIDriver"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:161
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:349
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:572
+msgid "Host startup on XenServer is not supported."
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:633
+msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:673
+msgid "Host is member of a pool, but DB says otherwise"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
+#, python-format
+msgid "Got exception: %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
+msgid "Raising NotImplemented"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:714
+#, python-format
+msgid "xenapi.fake does not have an implementation for %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:747
+#, python-format
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:753
+#, python-format
+msgid "Calling getter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:756
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:818
+#, python-format
+msgid ""
+"xenapi.fake does not have an implementation for %s or it has been called "
+"with the wrong number of arguments"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:70
+#, python-format
+msgid ""
+"Instance %(name)s running on %(host)s could not be found in the database:"
+" assuming it is a worker VM and skip ping migration to a new host"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:82
+#, python-format
+msgid "Aggregate for host %(host)s count not be found."
+msgstr ""
+
+#: nova/virt/xenapi/host.py:101
+#, python-format
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:185
+#, python-format
+msgid "Failed to extract instance support from %s"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:202
+msgid "Unable to get updated status"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:205
+#, python-format
+msgid "The call to %(method)s returned an error: %(e)s."
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:29
+#, python-format
+msgid "Found non-unique network for name_label %s"
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:47
+#, python-format
+msgid "Found non-unique network for bridge %s"
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:49
+#, python-format
+msgid "Found no network for bridge %s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:70
+#, python-format
+msgid ""
+"Aggregate %(aggregate_id)s: unrecoverable state during operation on "
+"%(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:158
+#, python-format
+msgid "Unable to eject %s from the pool; pool not empty"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:175
+#, python-format
+msgid "Unable to eject %s from the pool; No master found"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:192
+#, python-format
+msgid "Pool-Join failed: %s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:195
+#, python-format
+msgid "Unable to join %s in the pool"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:211
+#, python-format
+msgid "Pool-eject failed: %s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:223
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:234
+#, python-format
+msgid "Pool-set_name_label failed: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vif.py:101
+#, python-format
+msgid "Found no PIF for device %s"
+msgstr ""
+
+#: nova/virt/xenapi/vif.py:120
+#, python-format
+msgid ""
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"Expected %(vlan_num)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:275
+msgid "Created VM"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:287
+msgid "VM destroyed"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:292 nova/virt/xenapi/vm_utils.py:307
+msgid "VM already halted, skipping shutdown..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:296
+msgid "Shutting down VM (cleanly)"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+msgid "Shutting down VM (hard)"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:349
+#, python-format
+msgid "VBD not found in instance %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:366
+#, python-format
+msgid "VBD %s already detached"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:369
+#, python-format
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:376
+#, python-format
+msgid "Unable to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:381
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:392
+#, python-format
+msgid "Unable to destroy VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:414
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:418
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:445
+#, python-format
+msgid "Unable to destroy VDI %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:472
+#, python-format
+msgid ""
+"Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
+" on %(sr_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:488
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:513
+#, python-format
+msgid "block device info: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:599
+#, python-format
+msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:645
+#, python-format
+msgid "No primary VDI found for %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:657
+msgid "Starting snapshot for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:707
+#, python-format
+msgid "Destroying cached VDI '%(vdi_uuid)s'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
+#, python-format
+msgid ""
+"Fast cloning is only supported on default local SR of type ext. SR on "
+"this system was found to be of type %s. Ignoring the cow flag."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1028
+#, python-format
+msgid "Unrecognized cache_images value '%s', defaulting to True"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1062
+#, python-format
+msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1075
+#, python-format
+msgid ""
+"download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
+"params: %(params)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1089
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1124
+#, python-format
+msgid "Invalid value '%s' for xenapi_torrent_images"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1208
+#, python-format
+msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1226
+#, python-format
+msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1250
+#, python-format
+msgid "Fetching image %(image_id)s, type %(image_type_str)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1264
+#, python-format
+msgid "Size for image %(image_id)s: %(virtual_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1274
+#, python-format
+msgid ""
+"Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
+"bytes"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1294
+#, python-format
+msgid "Copying VDI %s to /boot/guest on dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1308
+#, python-format
+msgid "Kernel/Ramdisk VDI %s destroyed"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1317
+msgid "Failed to fetch glance image"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1358
+#, python-format
+msgid "Detected %(image_type_str)s format for image %(image_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1389
+#, python-format
+msgid "Looking up vdi %s for PV kernel"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1407
+#, python-format
+msgid ""
+"Image format is None: trying to determine PV status using pygrub; if "
+"instance with vdi %s does not boot correctly, try with image metadata."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1413
+#, python-format
+msgid "Unknown image format %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1444
+#, python-format
+msgid "VDI %s is still available"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1547
+#, python-format
+msgid "Unable to parse rrd of %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1575
+#, python-format
+msgid "Re-scanning SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1603
+#, python-format
+msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1621
+msgid ""
+"XenAPI is unable to find a Storage Repository to install guest instances "
+"on. Please check your configuration and/or configure the flag "
+"'sr_matching_filter'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1634
+msgid "Cannot find SR of content-type ISO"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1642
+#, python-format
+msgid "ISO: looking at SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1644
+msgid "ISO: not iso content"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1647
+msgid "ISO: iso content_type, no 'i18n-key' key"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1650
+msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1654
+msgid "ISO: SR MATCHing our criteria"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1656
+msgid "ISO: ISO, looking to see if it is host local"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1659
+#, python-format
+msgid "ISO: PBD %s disappeared"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1662
+#, python-format
+msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1665
+msgid "ISO: SR with local PBD"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1687
+#, python-format
+msgid ""
+"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
+"%(server)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1704
+#, python-format
+msgid "Unable to obtain RRD XML updates with server details: %s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1758
+#, python-format
+msgid "Invalid statistics data from Xenserver: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1818
+#, python-format
+msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1906
+#, python-format
+msgid ""
+"Parent %(parent_uuid)s doesn't match original parent "
+"%(original_parent_uuid)s, waiting for coalesce..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1918
+#, python-format
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1953
+#, python-format
+msgid "Timeout waiting for device %s to be created"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1973
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1986
+#, python-format
+msgid "Plugging VBD %s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1989
+#, python-format
+msgid "Plugging VBD %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1991
+#, python-format
+msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1995
+#, python-format
+msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2001
+#, python-format
+msgid "Destroying VBD for VDI %s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2009
+#, python-format
+msgid "Destroying VBD for VDI %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2036
+#, python-format
+msgid "Running pygrub against %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2044
+#, python-format
+msgid "Found Xen kernel %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2046
+msgid "No Xen kernel found.  Booting HVM."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2048
+msgid ""
+"Error while executing pygrub! Please, ensure the binary is installed "
+"correctly, and available in your PATH; on some Linux distros, pygrub may "
+"be installed in /usr/lib/xen-X.Y/bin/pygrub. Attempting to boot in HVM "
+"mode."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2065
+msgid "Partitions:"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2071
+#, python-format
+msgid "  %(num)s: %(ptype)s %(size)d sectors"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2097
+#, python-format
+msgid ""
+"Writing partition table %(primary_first)d %(primary_last)d to "
+"%(dev_path)s..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2112
+#, python-format
+msgid "Writing partition table %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2153
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2196
+#, python-format
+msgid ""
+"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
+"virtual_size=%(virtual_size)d block_size=%(block_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2232
+#, python-format
+msgid ""
+"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
+"reduction in size"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2285
+msgid "Manipulating interface files directly"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2294
+#, python-format
+msgid "Failed to mount filesystem (expected for non-linux instances): %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2407
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
+#, python-format
+msgid "Updating progress to %d"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:175
+#, python-format
+msgid "Importing image upload handler: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:190
+msgid "Error: Agent is disabled"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:309
+msgid "Starting instance"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:395
+msgid "Removing kernel/ramdisk files from dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:468
+#, python-format
+msgid "Block device information present: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:499
+msgid "Failed to spawn, rolling back"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:594
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:640
+msgid "Starting VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:646
+msgid "Waiting for instance state to become running"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:660
+#, python-format
+msgid ""
+"Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
+"%(version)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:663
+#, python-format
+msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:674
+#, python-format
+msgid "Instance agent version: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:705
+msgid "Setting VCPU weight"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:716
+#, python-format
+msgid "Could not find VM with name %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:774
+msgid "Finished snapshot and upload for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:778
+#, python-format
+msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:787
+msgid "Failed to transfer vhd to new host"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:813
+msgid "VM was already shutdown."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:817
+msgid "Clean shutdown did not complete successfully, trying hard shutdown."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:991
+#, python-format
+msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:998
+msgid "Resize complete"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1043
+msgid "Starting halted instance found during reboot"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1049
+msgid ""
+"Reboot failed due to bad volumes, detaching bad volumes and starting "
+"halted instance"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1151
+msgid "Unable to find root VBD/VDI for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1155
+msgid "Destroying VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1182
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1189
+msgid "instance has a kernel or ramdisk but not both"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1196
+msgid "kernel/ramdisk files removed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1223
+msgid "Destroying VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1252
+msgid "VM is not present, skipping destroy..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1303
+#, python-format
+msgid "Instance is already in Rescue Mode: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1337
+msgid "VM is not present, skipping soft delete..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1390
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1540
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1562
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1574
+#, python-format
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1603
+msgid "Injecting hostname to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1707
+#, python-format
+msgid "Destination host:%s must be in the same aggregate as the source server"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1728
+msgid "No suitable network for migrate"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1740
+msgid "Migrate Receive failed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1814
+msgid "XAPI supporting relax-xsm-sr-check=true requried"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1825
+msgid "VM.assert_can_migrate failed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1878
+msgid "Migrate Send failed"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:51
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:61
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:68
+msgid "Creating PBD for SR"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:71
+msgid "Plugging SR"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:82
+msgid "Forgetting SR..."
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:104
+#, python-format
+msgid "Unable to find SR from VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:121
+#, python-format
+msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:129
+#, python-format
+msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:153
+#, python-format
+msgid "Unable to introduce VDI on SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:161
+#, python-format
+msgid "Unable to get record of VDI %s on"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:183
+#, python-format
+msgid "Unable to introduce VDI for SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:193
+msgid "Cannot purge SR with referenced VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
+#, python-format
+msgid "Unable to obtain target information %s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:47
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
+
+#: nova/virt/xenapi/imageupload/glance.py:69
+#, python-format
+msgid ""
+"Asking xapi to upload to glance %(vdi_uuids)s as ID %(image_id)s glance "
+"server: %(glance_host)s:%(glance_port)d attempt "
+"%(attempt_num)d/%(max_attempts)d"
+msgstr ""
+
+#: nova/virt/xenapi/imageupload/glance.py:87
+#, python-format
+msgid "upload_vhd failed: %r"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:95 nova/vnc/xvp_proxy.py:100
+#, python-format
+msgid "Error in handshake: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:115
+#, python-format
+msgid "Invalid request: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:135
+#, python-format
+msgid "Request: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:138
+#, python-format
+msgid "Request made with missing token: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:148
+#, python-format
+msgid "Request made with invalid token: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:155
+#, python-format
+msgid "Unexpected error: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:175
+#, python-format
+msgid "Starting nova-xvpvncproxy node (version %s)"
+msgstr ""
+
+#: nova/volume/cinder.py:98
+#, python-format
+msgid "Cinderclient connection created using URL: %s"
+msgstr ""
+
+#: nova/volume/cinder.py:229
+msgid "status must be 'in-use'"
+msgstr ""
+
+#: nova/volume/cinder.py:235
+msgid "status must be 'available'"
+msgstr ""
+
diff --git a/nova/locale/pt/LC_MESSAGES/nova.po b/nova/locale/pt/LC_MESSAGES/nova.po
index 03fbecea6..35bb5ff06 100644
--- a/nova/locale/pt/LC_MESSAGES/nova.po
+++ b/nova/locale/pt/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 42c2c39b8..f38b40280 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-05-04 19:25+0000\n"
 "Last-Translator: Júlio Cezar Santos Pires <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -194,7 +194,7 @@ msgstr "Dados recebidos é inválido"
 msgid "Invalid volume"
 msgstr "Volume inválido"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -668,8 +668,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s não encontrada."
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -977,7 +978,7 @@ msgstr "group %s já existe"
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1201,180 +1202,185 @@ msgstr "A instância %(instance_id)s não está executando."
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1463,67 +1469,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "depuração em retorno de chamada: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Endereço para Link Local não encontrado: %s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Não foi possível atribuir um IP para o Link Local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend inválido: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1890,11 +1911,6 @@ msgstr "Desatribuir endereço %s"
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2360,17 +2376,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Assinatura inválida para usuário %s"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Assinatura inválida para usuário %s"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2378,6 +2397,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr "Imagem não encontrada."
 
@@ -2402,6 +2423,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2415,14 +2437,14 @@ msgstr "Instância não existe"
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr "Este pedido estava com taxa limitada."
 
@@ -2457,9 +2479,9 @@ msgstr "Host %(host)s não encontrado."
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2593,117 +2615,121 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Ponto de montagem não pode ser traduzido: %s"
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Ponto de montagem não pode ser traduzido: %s"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2712,22 +2738,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2809,6 +2835,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr "Instância não encontrada"
 
@@ -3041,15 +3068,19 @@ msgstr "Certificado %(certificate_id)s não encontrado."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 #, fuzzy
 msgid "Flavor not found."
 msgstr "Imagem não encontrada."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 #, fuzzy
 msgid "No request body"
 msgstr "Corpo do pedido está mal formado"
@@ -3521,98 +3552,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "sem método para mensagem: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "sem método para mensagem: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3703,6 +3747,40 @@ msgstr "Executando VPN para %s"
 msgid "Failed to load %s"
 msgstr "Não foi possível criar volume"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3718,6 +3796,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4119,213 +4212,213 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Não é possível anexar o volume na instância %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4416,677 +4509,697 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Removendo rede com id %s"
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desanexar volume %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Iniciando instância %s"
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instância não existe"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Remover volume com id: %s"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instância %s não encontrada"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Iniciando instância %s"
@@ -5206,12 +5319,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5337,34 +5450,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "Corpo do pedido está mal formado"
@@ -5374,7 +5487,7 @@ msgstr "Corpo do pedido está mal formado"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5717,42 +5830,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d está ultrapassado, reiniciando radvd"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Backend inválido: %s"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Iniciando a VLAN %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Iniciando instância %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Interface %(interface)s não encontrada."
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Falha ao suspender instância"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Iniciando instância %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Removendo o registro da imagem %s"
@@ -5914,7 +6027,7 @@ msgstr "_remover: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6799,7 +6912,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6910,11 +7023,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6925,6 +7033,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6964,10 +7077,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7015,13 +7141,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7206,61 +7337,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7381,7 +7512,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8223,7 +8354,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8579,12 +8710,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8930,103 +9061,103 @@ msgstr "volume %s: criado com sucesso"
 msgid "Failed to soft reboot instance."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9034,76 +9165,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Obtendo o tamanho da imagem para a imagem %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9111,50 +9257,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9164,67 +9310,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9444,47 +9595,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9492,7 +9644,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9500,7 +9652,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9508,7 +9660,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10885,229 +11037,229 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Tamanho da imagem %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando o VDI %s de /boot/guest no dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk %s destruidos"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Verificando o vdi %s para kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "O VDI %s continua disponível"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "O VHD %(vdi_uuid)s tem pai %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Conectando VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "O VDB %s foi conectado."
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruindo VBD para o VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "O VBD para o VDI %s foi destruído."
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Rodando pygrub novamente %s"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen encontrado: %s"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen não encontrado. Iniciando como HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11115,58 +11267,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11517,3 +11669,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ro/LC_MESSAGES/nova.po b/nova/locale/ro/LC_MESSAGES/nova.po
index 9f72dffd5..1407565e6 100644
--- a/nova/locale/ro/LC_MESSAGES/nova.po
+++ b/nova/locale/ro/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-06-10 18:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Romanian "
@@ -195,7 +195,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -664,8 +664,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -973,7 +974,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1197,180 +1198,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1458,67 +1464,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1881,11 +1902,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2349,17 +2365,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2367,6 +2386,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2391,6 +2412,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2404,14 +2426,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2445,9 +2467,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2581,111 +2603,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2694,22 +2720,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2791,6 +2817,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3018,14 +3045,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3486,97 +3517,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3667,6 +3711,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3682,6 +3760,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4074,205 +4167,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4362,657 +4455,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5132,12 +5245,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5260,34 +5373,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5297,7 +5410,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5639,42 +5752,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5835,7 +5948,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6709,7 +6822,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6820,11 +6933,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6835,6 +6943,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6874,10 +6987,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6925,13 +7051,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7116,61 +7247,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7290,7 +7421,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8120,7 +8251,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8472,12 +8603,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8810,100 +8941,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8911,76 +9042,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8988,50 +9134,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9041,67 +9187,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9321,47 +9472,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9369,7 +9521,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9377,7 +9529,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9385,7 +9537,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10747,228 +10899,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10976,58 +11128,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11374,3 +11526,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 6ef21de13..e25cff9ad 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-03-25 09:34+0000\n"
 "Last-Translator: Eugene Marshal <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr "�едопу�тимый том"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -681,8 +681,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr "Интерфей� %(interface)s не найден."
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -998,7 +999,7 @@ msgstr "Тип копии %(name)s уже �уще�твует."
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1228,181 +1229,186 @@ msgstr "Копи� %(instance_id)s не найдена"
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Подключить том %(volume_id)s дл� копии %(instance_id)s на %(device)s"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Копи� %(instance_id)s не переведена в режим во��тановлени�"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Копи� %(instance_id)s не переведена в режим во��тановлени�"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Тип копии %(name)s уже �уще�твует."
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Ожидал�� объект типа: %s"
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1491,67 +1497,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "отладка в обратном вызове: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "�едопу�тимый внутренний интерфей�: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Ожидал�� объект типа: %s"
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "�едопу�тима� server_string: %s"
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' зан�ла %(total_time).2f �."
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удалени� контейнера: %s"
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1927,11 +1948,6 @@ msgstr "И�ключить адре� %s"
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Образ должен быть до�тупен"
@@ -2404,17 +2420,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr "Инициализаци� ди�петчера ра�ширений."
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "�е допу�тима� подпи�ь дл� пользовател� %s"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "�е допу�тима� подпи�ь дл� пользовател� %s"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2422,6 +2441,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr "образ не найден."
 
@@ -2446,6 +2467,7 @@ msgid "Invalid metadata key"
 msgstr "�еправильный ключ метаданных"
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2459,7 +2481,7 @@ msgstr "Копи� не �уще�твует"
 msgid "Instance is not a member of specified network"
 msgstr "Копи� не �вл�ет�� уча�тником заданной �ети"
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
@@ -2468,7 +2490,7 @@ msgstr ""
 "Только %(value)s %(verb)s запро�(ов) могут быть �деланы дл� %(uri)s, "
 "каждые %(unit_string)s."
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2503,9 +2525,9 @@ msgstr "Узел %(host)s не найден."
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2640,118 +2662,122 @@ msgstr "�евозможно найти запрошенный образ"
 msgid "Invalid key_name provided."
 msgstr "Предо�тавлен недопу�тимый key_name."
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Точка подключени� не может быть переведена: %s"
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Точка подключени� не может быть переведена: %s"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr "С копией не производило�ь изменение размера."
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Копи� %(instance_id)s не найдена."
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr "От�ут�твует аргумент типа 'type' дл� перезагрузки"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Изменение размера требует изменени� объёма."
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "Копи� %(instance_id)s не найдена."
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "�едопу�тимый запро� тела"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "От�ут�твует атрибут imageRef"
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "От�ут�твует атрибут flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr "adminPass не был задан"
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr "�едопу�тимый adminPass"
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Запро� изменени� размера имеет недопу�тимый атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Запро�ы изменение размера требуют атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2760,22 +2786,22 @@ msgstr "Запро�ы изменение размера требуют атри
 msgid "Invalid request body"
 msgstr "�едопу�тимый запро� тела"
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
@@ -2857,6 +2883,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr "Копи� не найдена"
 
@@ -3094,15 +3121,19 @@ msgstr "Сертификат %(certificate_id)s не найден."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 #, fuzzy
 msgid "Flavor not found."
 msgstr "Сервер не найден."
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 #, fuzzy
 msgid "No request body"
 msgstr "�ет тела запро�а"
@@ -3580,98 +3611,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "не определен метод дл� �ообщени�: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "Ошибка загрузки ра�ширени� %(ext_factory)s: %(exc)s"
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "не определен метод дл� �ообщени�: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, fuzzy, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr "Выгрузка образа %s"
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "�е найден том дл� копии %(instance_id)s."
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "�е найден том дл� копии %(instance_id)s."
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3762,6 +3806,40 @@ msgstr "Запу�к VPN дл� %s"
 msgid "Failed to load %s"
 msgstr "�евозможно �оздать том"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3777,6 +3855,21 @@ msgstr "�лемент не �вл�ет�� потомком"
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4187,81 +4280,81 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "�евозможно при�оединить том дл� копии %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполн�ет запу�к %s копий..."
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Выполнение завершени� работы копий"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Выполнение завершени� работы копий"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "От�ут�твует узел дл� копии %s, немедленное удаление"
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнени� попытка завершить работу %s"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Попытка о�тановить %s"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Попытка запу�тить %s"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr "Пои�к по: %s"
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Запу�к �нимка дл� ВМ %s"
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4270,63 +4363,63 @@ msgstr ""
 "У�таревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "Превышена квота дл� %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Будет выполнени� попытка завершить работу %s"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Группа безопа�но�ти %s не может быть пу�той."
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4335,70 +4428,70 @@ msgstr ""
 "Значение (%s) дл� параметра GroupName недопу�тимо. Длина превышает "
 "мак�имально допу�тимое значение 255."
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопа�но�ти %s"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Группа безопа�но�ти %s уже �уще�твует"
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "�евозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "�евозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Группа безопа�но�ти (%s) не найдена"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Правило (%s) не найдено"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Добавление правила группы безопа�но�ти: %r"
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4489,260 +4582,280 @@ msgstr "Ошибка БД: %s"
 msgid "Instance type %s not found for deletion"
 msgstr "Копи� типа %s не найдена дл� выполнени� удалени�"
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "�евозможно переме�тить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Драйвер гипервизора не поддерживает правила брандмау�ра"
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Драйвер гипервизора не поддерживает правила брандмау�ра"
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "�епредвиденный код �о�то�ни�"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "у�тановка �етевого узла"
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Пропу�к DiskNotFound: %s"
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Пропу�к DiskNotFound: %s"
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Обновление �борки %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s ра�полагает�� на общедо�тупном накопителе: %(reason)s"
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Создать �нимок из тома %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4751,26 +4864,26 @@ msgstr ""
 "попытка перезагрузки не выполн�емой копии: %(instance_uuid)s (�о�то�ние: "
 "%(state)s ожидало�ь: %(running)s)"
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "копи� не включена"
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "копи� %s: выполнение �нимка"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4779,229 +4892,229 @@ msgstr ""
 "попытка �оздани� �нимка не выполн�емой копии: %(instance_uuid)s "
 "(�о�то�ние: %(state)s ожидало�ь: %(running)s)"
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "�айдено %(num_images)d образов (ротаци�: %(rotation)d)"
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "�евозможно назначить пароль админи�тратора. Копи� %s не выполн�ет��"
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 #, fuzzy
 msgid "Root password set"
 msgstr "Копи� %s: �азначение админи�тративного парол�"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Ошибка назначени� парол� админи�тратора"
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Копи� не �уще�твует"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "назначение �овпадает � и�точником!"
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "копи� %s: прин�тие диагно�тики"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "Во��тановление �ети"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "у�тановка �етевого узла"
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Получить кон�ольный вывод дл� копии %s"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "копи� %s: получение кон�оли vnc"
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "копи� %s: получение кон�оли vnc"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "От�оединение тома от неизве�тной копии %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Попытка удалени� не�уще�твующей кон�оли %(console_id)s."
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "�етевые ра�пределени� дл� копии %s"
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -5010,21 +5123,21 @@ msgstr ""
 "от�ут�твует домен � �оответ�твующим именем.\" Эта ошибка может быть "
 "безопа�но пропущена."
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Ошибка получени� метаданных дл� ip: %s"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -5033,64 +5146,64 @@ msgstr ""
 "�айдены %(migration_count)d неподтверждённых перемещений, �тарше "
 "%(confirm_window)d �екунд"
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "Завершение работы ВМ дл� копии %(instance_uuid)s"
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "Обновление временных данных и�пользовани� поло�ы пропу�кани�"
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Обновление временных данных и�пользовани� поло�ы пропу�кани�"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "Обновление �о�то�ни� узла"
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5099,86 +5212,86 @@ msgstr ""
 "�айдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
 "гипервизоре."
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "копи� не включена"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, пропу�к..."
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "�ет �лужбы дл� compute ID %s"
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
@@ -5300,12 +5413,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
@@ -5433,34 +5546,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "�ера�познанное значение read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "�едопу�тимый запро� тела"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "�едопу�тимый запро� тела"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "�едопу�тимый запро� тела"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "�едопу�тимый запро� тела"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "�едопу�тимый запро� тела"
@@ -5470,7 +5583,7 @@ msgstr "�едопу�тимый запро� тела"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5816,42 +5929,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "�едопу�тимое �о�то�ние: '%s'"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Запу�к интерфей�а VLAN %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Запу�к копии %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Интерфей� %(interface)s не найден"
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Запу�к копии %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Ошибка запу�ка xvp: %s"
@@ -6025,7 +6138,7 @@ msgstr "_удалить: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6926,7 +7039,7 @@ msgstr "�евозможно найти другой compute"
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -7037,11 +7150,6 @@ msgstr "�ет �лужбы дл� compute ID %s"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr "Ошибка schedule_%(method)s: %(ex)s"
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -7052,6 +7160,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -7091,10 +7204,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7142,13 +7268,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7334,7 +7465,7 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 #, fuzzy
 msgid ""
@@ -7342,55 +7473,55 @@ msgid ""
 "instances"
 msgstr "Превышена квота дл� %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "Выполн�емые копии: %s"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "По�ле завершени� работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "Внутренн�� ошибка"
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "По�ле принудительного завершени� работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "Ошибка аутентификации"
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7514,7 +7645,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8353,7 +8484,7 @@ msgstr "Вер�и� агента копии: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8715,12 +8846,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Перечень копий"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "�евозможно найти конфигурацию по адре�у %(path)s"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "�евозможно найти конфигурацию по адре�у %(path)s"
@@ -9066,101 +9197,101 @@ msgstr "�нимок %s: �оздание завершено"
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Пользователь не имеет админи�тративных привилегий"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr "Создание изображени�"
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Запро� xapi на приём образа vhd %(image)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9168,19 +9299,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9189,33 +9320,48 @@ msgstr ""
 "Ошибка libvirt во врем� пои�ка %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9224,25 +9370,25 @@ msgstr ""
 "�евозможно получить количе�тво ЦПУ, так как �та возможно�ть не "
 "реализована дл� �той платформы. Эту ошибку можно безопа�но пропу�тить."
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "у�таревша� вер�и� libvirt (не поддерживает�� getVersion)"
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Получение размера образа дл� образа %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9250,21 +9396,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9273,29 +9419,29 @@ msgstr ""
 "Создание временного файла %s дл� оповещени� других узлов �ети compute о "
 "необходимо�ти при�оединени� того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9305,7 +9451,7 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9314,22 +9460,22 @@ msgstr ""
 "Создание временного файла %s дл� оповещени� других узлов �ети compute о "
 "необходимо�ти при�оединени� того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() ошибка %(cnt)d.До %(max_retry)d попыток дл� %(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9338,39 +9484,44 @@ msgstr ""
 "Ошибка libvirt во врем� пои�ка %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Копи� %s: выполнение"
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9592,48 +9743,49 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "�епредвиденна� ошибка: %s"
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 #, fuzzy
 msgid "Failed while unplugging vif"
 msgstr "Ошибка от�оединени� vif копии '%s'"
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9641,7 +9793,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9649,7 +9801,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9657,7 +9809,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -11081,29 +11233,29 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 "Размер образа %(size_bytes)d превышает допу�тимый instance_type  размер "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Ядро не найдено дл� образа %(image_id)s."
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -11112,204 +11264,204 @@ msgstr ""
 "Превышен размер �дра/Ramdisk образа: %(vdi_size)d байт, мак�. "
 "%(max_size)d байт"
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Копирование VDI %s в /boot/guest на dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Ядро/Ramdisk VDI %s ликвидирован"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Обнаружен %(image_type_str)s формат дл� образа %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Пои�к vdi %s дл� �дра PV"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s до �их пор до�тупен"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Повторна� проверка SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr "�евозможно найти SR типа �одержимого ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr "ISO: не �одержимое iso типа"
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR � локальной PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Врем� ожидани� при �оздании у�трой�тва %s"
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Под�оединение VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Под�оединение VBD %s выполнено."
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s под�оединено как %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 "VBD %(vbd_ref)s под�оединено в неправильный dev, изменение назначени� на "
 "%(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ликвидирование VBD дл� VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ликвидирование VBD дл� VDI %s завершено."
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "�айдено �дро Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Ядро Xen не найдено.  Загрузка HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11317,16 +11469,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr "Разделы:"
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d �екторов"
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -11335,44 +11487,44 @@ msgstr ""
 "Запи�ь таблицы разделов %(primary_first)d %(primary_last)d в "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Запи�ь таблицы разделов %s выполнена."
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 "Ошибка при�оединени� файловой �и�темы (ожидаемо дл� копий не на базе "
 "linux): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11744,3 +11896,18 @@ msgstr "Образ должен быть до�тупен"
 msgid "status must be 'available'"
 msgstr "Образ должен быть до�тупен"
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr "Ошибка schedule_%(method)s: %(ex)s"
+
diff --git a/nova/locale/ru_RU/LC_MESSAGES/nova.po b/nova/locale/ru_RU/LC_MESSAGES/nova.po
index e6289583d..854ba7375 100644
--- a/nova/locale/ru_RU/LC_MESSAGES/nova.po
+++ b/nova/locale/ru_RU/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian (Russia) "
@@ -195,7 +195,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -664,8 +664,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -973,7 +974,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1197,180 +1198,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1458,67 +1464,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1881,11 +1902,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2349,17 +2365,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2367,6 +2386,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2391,6 +2412,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2404,14 +2426,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2445,9 +2467,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2581,111 +2603,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2694,22 +2720,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2791,6 +2817,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3018,14 +3045,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3486,97 +3517,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3667,6 +3711,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3682,6 +3760,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4074,205 +4167,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4362,657 +4455,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5132,12 +5245,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5260,34 +5373,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5297,7 +5410,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5639,42 +5752,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5835,7 +5948,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6709,7 +6822,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6820,11 +6933,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6835,6 +6943,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6874,10 +6987,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6925,13 +7051,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7116,61 +7247,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7290,7 +7421,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8120,7 +8251,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8472,12 +8603,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8810,100 +8941,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8911,76 +9042,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8988,50 +9134,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9041,67 +9187,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9321,47 +9472,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9369,7 +9521,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9377,7 +9529,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9385,7 +9537,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10747,228 +10899,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10976,58 +11128,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11374,3 +11526,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/sl_SI/LC_MESSAGES/nova.po b/nova/locale/sl_SI/LC_MESSAGES/nova.po
new file mode 100644
index 000000000..ee4ef04f4
--- /dev/null
+++ b/nova/locale/sl_SI/LC_MESSAGES/nova.po
@@ -0,0 +1,11528 @@
+# Slovenian (Slovenia) translations for nova.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the nova project.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version:  Nova\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
+"PO-Revision-Date: 2013-06-28 18:59+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language-Team: Slovenian (Slovenia) "
+"(http://www.transifex.com/projects/p/openstack/language/sl_SI/)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 "
+"|| n%100==4 ? 2 : 3)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
+#, python-format
+msgid "block_device_list %s"
+msgstr ""
+
+#: nova/context.py:63
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:108
+#, python-format
+msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
+msgstr ""
+
+#: nova/crypto.py:55
+msgid "Filename of root CA"
+msgstr ""
+
+#: nova/crypto.py:58
+msgid "Filename of private key"
+msgstr ""
+
+#: nova/crypto.py:61
+msgid "Filename of root Certificate Revocation List"
+msgstr ""
+
+#: nova/crypto.py:64
+msgid "Where we keep our keys"
+msgstr ""
+
+#: nova/crypto.py:67
+msgid "Where we keep our root CA"
+msgstr ""
+
+#: nova/crypto.py:70
+msgid "Should we use a CA for each project?"
+msgstr ""
+
+#: nova/crypto.py:74
+#, python-format
+msgid "Subject for certificate for users, %s for project, user, timestamp"
+msgstr ""
+
+#: nova/crypto.py:79
+#, python-format
+msgid "Subject for certificate for projects, %s for project, timestamp"
+msgstr ""
+
+#: nova/crypto.py:210
+msgid "Unable to find the key"
+msgstr ""
+
+#: nova/crypto.py:393
+msgid "Failed to write inbound.csr"
+msgstr ""
+
+#: nova/crypto.py:395
+#, python-format
+msgid "Flags path: %s"
+msgstr ""
+
+#: nova/exception.py:113
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
+msgid "Exception in string format operation"
+msgstr ""
+
+#: nova/exception.py:155
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:165
+#, python-format
+msgid "Failed to encrypt text: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:169
+#, python-format
+msgid "Failed to decrypt text: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:173
+msgid "Virtual Interface creation failed"
+msgstr ""
+
+#: nova/exception.py:177
+msgid "5 attempts to create virtual interfacewith unique mac address failed"
+msgstr ""
+
+#: nova/exception.py:182
+#, python-format
+msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:187
+msgid "Not authorized."
+msgstr ""
+
+#: nova/exception.py:192
+msgid "User does not have admin privileges"
+msgstr ""
+
+#: nova/exception.py:196
+#, python-format
+msgid "Policy doesn't allow %(action)s to be performed."
+msgstr ""
+
+#: nova/exception.py:200
+#, python-format
+msgid "Image %(image_id)s is not active."
+msgstr ""
+
+#: nova/exception.py:204
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:208
+msgid "Unacceptable parameters."
+msgstr ""
+
+#: nova/exception.py:213
+msgid "Block Device Mapping is Invalid."
+msgstr ""
+
+#: nova/exception.py:217
+#, python-format
+msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
+msgstr ""
+
+#: nova/exception.py:222
+#, python-format
+msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
+msgstr ""
+
+#: nova/exception.py:227
+msgid ""
+"Block Device Mapping is Invalid: some fields are not recognized, or have "
+"invalid values."
+msgstr ""
+
+#: nova/exception.py:233
+msgid "Block Device Mapping cannot be converted to legacy format. "
+msgstr ""
+
+#: nova/exception.py:238
+#, python-format
+msgid "Volume %(volume_id)s is not attached to anything"
+msgstr ""
+
+#: nova/exception.py:242
+#, python-format
+msgid ""
+"Volume %(volume_id)s did not finish being created even after we waited "
+"%(seconds)s seconds or %(attempts)s attempts."
+msgstr ""
+
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
+msgid "Keypair data is invalid"
+msgstr ""
+
+#: nova/exception.py:252
+msgid "The request is invalid."
+msgstr ""
+
+#: nova/exception.py:256
+msgid "Invalid input received"
+msgstr ""
+
+#: nova/exception.py:260
+msgid "Invalid volume"
+msgstr ""
+
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/contrib/admin_actions.py:242
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:268
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:272
+#, python-format
+msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
+msgstr ""
+
+#: nova/exception.py:276
+#, python-format
+msgid "Invalid IP protocol %(protocol)s."
+msgstr ""
+
+#: nova/exception.py:280
+#, python-format
+msgid "Invalid content type %(content_type)s."
+msgstr ""
+
+#: nova/exception.py:284
+#, python-format
+msgid "Invalid cidr %(cidr)s."
+msgstr ""
+
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: nova/exception.py:295
+#, python-format
+msgid "%(err)s"
+msgstr ""
+
+#: nova/exception.py:299
+#, python-format
+msgid ""
+"Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
+" %(reason)s."
+msgstr ""
+
+#: nova/exception.py:304
+#, python-format
+msgid "Group not valid. Reason: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: nova/exception.py:312
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
+" the instance is in this state."
+msgstr ""
+
+#: nova/exception.py:317
+#, python-format
+msgid "Instance %(instance_id)s is not running."
+msgstr ""
+
+#: nova/exception.py:321
+#, python-format
+msgid "Instance %(instance_id)s is not in rescue mode"
+msgstr ""
+
+#: nova/exception.py:325
+#, python-format
+msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:329
+#, python-format
+msgid "Instance %(instance_id)s is not ready"
+msgstr ""
+
+#: nova/exception.py:333
+msgid "Failed to suspend instance"
+msgstr ""
+
+#: nova/exception.py:337
+#, python-format
+msgid "Failed to resume instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:341
+#, python-format
+msgid "Failed to power on instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:345
+#, python-format
+msgid "Failed to power off instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:349
+msgid "Failed to reboot instance"
+msgstr ""
+
+#: nova/exception.py:353
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:357
+msgid "Failed to deploy instance"
+msgstr ""
+
+#: nova/exception.py:361
+msgid "Service is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:365
+msgid "Insufficient compute resources."
+msgstr ""
+
+#: nova/exception.py:369
+#, python-format
+msgid "Compute service of %(host)s is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:373
+#, python-format
+msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
+msgstr ""
+
+#: nova/exception.py:378
+msgid "The supplied hypervisor type of is invalid."
+msgstr ""
+
+#: nova/exception.py:382
+msgid "The instance requires a newer hypervisor version than has been provided."
+msgstr ""
+
+#: nova/exception.py:387
+#, python-format
+msgid ""
+"The supplied disk path (%(path)s) already exists, it is expected not to "
+"exist."
+msgstr ""
+
+#: nova/exception.py:392
+#, python-format
+msgid "The supplied device path (%(path)s) is invalid."
+msgstr ""
+
+#: nova/exception.py:396
+#, python-format
+msgid "The supplied device path (%(path)s) is in use."
+msgstr ""
+
+#: nova/exception.py:401
+#, python-format
+msgid "The supplied device (%(device)s) is busy."
+msgstr ""
+
+#: nova/exception.py:405
+msgid "Unacceptable CPU info"
+msgstr ""
+
+#: nova/exception.py:409
+#, python-format
+msgid "%(address)s is not a valid IP v4/6 address."
+msgstr ""
+
+#: nova/exception.py:413
+#, python-format
+msgid ""
+"VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
+"tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
+msgstr ""
+
+#: nova/exception.py:419
+#, python-format
+msgid ""
+"vSwitch which contains the port group %(bridge)s is not associated with "
+"the desired physical adapter. Expected vSwitch is %(expected)s, but the "
+"one associated is %(actual)s."
+msgstr ""
+
+#: nova/exception.py:426
+#, python-format
+msgid "Disk format %(disk_format)s is not acceptable"
+msgstr ""
+
+#: nova/exception.py:430
+#, python-format
+msgid "Image %(image_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:434
+#, python-format
+msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:438
+#, python-format
+msgid "Ec2 id %(ec2_id)s is unacceptable."
+msgstr ""
+
+#: nova/exception.py:442
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
+msgstr ""
+
+#: nova/exception.py:446
+#, python-format
+msgid "Invalid ID received %(id)s."
+msgstr ""
+
+#: nova/exception.py:450
+msgid "Constraint not met."
+msgstr ""
+
+#: nova/exception.py:455
+msgid "Resource could not be found."
+msgstr ""
+
+#: nova/exception.py:460
+#, python-format
+msgid "No agent-build associated with id %(id)s."
+msgstr ""
+
+#: nova/exception.py:464
+#, python-format
+msgid "Volume %(volume_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:468
+#, python-format
+msgid "Snapshot %(snapshot_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:472
+#, python-format
+msgid "No target id found for volume %(volume_id)s."
+msgstr ""
+
+#: nova/exception.py:476
+#, python-format
+msgid "No disk at %(location)s"
+msgstr ""
+
+#: nova/exception.py:480
+#, python-format
+msgid "Could not find a handler for %(driver_type)s volume."
+msgstr ""
+
+#: nova/exception.py:484
+#, python-format
+msgid "Invalid image href %(image_href)s."
+msgstr ""
+
+#: nova/exception.py:488
+#, python-format
+msgid "Image %(image_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:492
+#, python-format
+msgid ""
+"Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
+" dynamically when they are listed for the first time. Have you listed "
+"image ids since adding this image?"
+msgstr ""
+
+#: nova/exception.py:499
+#, python-format
+msgid "Project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:503
+msgid "Cannot find SR to read/write VDI."
+msgstr ""
+
+#: nova/exception.py:507
+#, python-format
+msgid "Network %(network_id)s is duplicated."
+msgstr ""
+
+#: nova/exception.py:511
+#, python-format
+msgid "Network %(network_id)s is still in use."
+msgstr ""
+
+#: nova/exception.py:515
+#, python-format
+msgid "%(req)s is required to create a network."
+msgstr ""
+
+#: nova/exception.py:519
+#, python-format
+msgid "Network %(network_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:523
+#, python-format
+msgid "Port id %(port_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:527
+#, python-format
+msgid "Network could not be found for bridge %(bridge)s"
+msgstr ""
+
+#: nova/exception.py:531
+#, python-format
+msgid "Network could not be found for uuid %(uuid)s"
+msgstr ""
+
+#: nova/exception.py:535
+#, python-format
+msgid "Network could not be found with cidr %(cidr)s."
+msgstr ""
+
+#: nova/exception.py:539
+#, python-format
+msgid "Network could not be found for instance %(instance_id)s."
+msgstr ""
+
+#: nova/exception.py:543
+msgid "No networks defined."
+msgstr ""
+
+#: nova/exception.py:547
+#, python-format
+msgid ""
+"Either Network uuid %(network_uuid)s is not present or is not assigned to"
+" the project %(project_id)s."
+msgstr ""
+
+#: nova/exception.py:552
+msgid "Could not find the datastore reference(s) which the VM uses."
+msgstr ""
+
+#: nova/exception.py:556
+#, python-format
+msgid "Port %(port_id)s is still in use."
+msgstr ""
+
+#: nova/exception.py:560
+#, python-format
+msgid "Port %(port_id)s not usable for instance %(instance)s."
+msgstr ""
+
+#: nova/exception.py:564
+#, python-format
+msgid "No free port available for instance %(instance)s."
+msgstr ""
+
+#: nova/exception.py:568
+#, python-format
+msgid "No fixed IP associated with id %(id)s."
+msgstr ""
+
+#: nova/exception.py:572
+#, python-format
+msgid "Fixed ip not found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:576
+#, python-format
+msgid "Instance %(instance_uuid)s has zero fixed ips."
+msgstr ""
+
+#: nova/exception.py:580
+#, python-format
+msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
+msgstr ""
+
+#: nova/exception.py:585
+#, python-format
+msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
+msgstr ""
+
+#: nova/exception.py:589
+#, python-format
+msgid ""
+"Fixed IP address (%(address)s) does not exist in network "
+"(%(network_uuid)s)."
+msgstr ""
+
+#: nova/exception.py:594
+#, python-format
+msgid ""
+"Fixed IP address %(address)s is already in use on instance "
+"%(instance_uuid)s."
+msgstr ""
+
+#: nova/exception.py:599
+#, python-format
+msgid "More than one instance is associated with fixed ip address '%(address)s'."
+msgstr ""
+
+#: nova/exception.py:604
+#, python-format
+msgid "Fixed IP address %(address)s is invalid."
+msgstr ""
+
+#: nova/exception.py:608
+msgid "Zero fixed ips available."
+msgstr ""
+
+#: nova/exception.py:612
+msgid "Zero fixed ips could be found."
+msgstr ""
+
+#: nova/exception.py:621
+#, python-format
+msgid "Floating ip %(address)s already exists."
+msgstr ""
+
+#: nova/exception.py:625
+#, python-format
+msgid "Floating ip not found for id %(id)s."
+msgstr ""
+
+#: nova/exception.py:629
+#, python-format
+msgid "The DNS entry %(name)s already exists in domain %(domain)s."
+msgstr ""
+
+#: nova/exception.py:633
+#, python-format
+msgid "Floating ip not found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:637
+#, python-format
+msgid "Floating ip not found for host %(host)s."
+msgstr ""
+
+#: nova/exception.py:641
+#, python-format
+msgid "Multiple floating ips are found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:645
+msgid "Floating ip pool not found."
+msgstr ""
+
+#: nova/exception.py:650
+msgid "Zero floating ips available."
+msgstr ""
+
+#: nova/exception.py:655
+#, python-format
+msgid "Floating ip %(address)s is associated."
+msgstr ""
+
+#: nova/exception.py:659
+#, python-format
+msgid "Floating ip %(address)s is not associated."
+msgstr ""
+
+#: nova/exception.py:663
+msgid "Zero floating ips exist."
+msgstr ""
+
+#: nova/exception.py:667
+#, python-format
+msgid "Interface %(interface)s not found."
+msgstr ""
+
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
+msgstr ""
+
+#: nova/exception.py:675
+#, python-format
+msgid "Keypair %(name)s not found for user %(user_id)s"
+msgstr ""
+
+#: nova/exception.py:679
+#, python-format
+msgid "Service %(service_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:683
+#, python-format
+msgid "Host %(host)s could not be found."
+msgstr ""
+
+#: nova/exception.py:687
+#, python-format
+msgid "Compute host %(host)s could not be found."
+msgstr ""
+
+#: nova/exception.py:691
+#, python-format
+msgid "Could not find binary %(binary)s on host %(host)s."
+msgstr ""
+
+#: nova/exception.py:695
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
+#: nova/exception.py:699
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:704
+msgid "Quota could not be found"
+msgstr ""
+
+#: nova/exception.py:708
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:712
+#, python-format
+msgid "Quota for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:716
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:720
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:724
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:728
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:732
+#, python-format
+msgid "Security group %(security_group_id)s not found."
+msgstr ""
+
+#: nova/exception.py:736
+#, python-format
+msgid "Security group %(security_group_id)s not found for project %(project_id)s."
+msgstr ""
+
+#: nova/exception.py:741
+#, python-format
+msgid "Security group with rule %(rule_id)s not found."
+msgstr ""
+
+#: nova/exception.py:745
+#, python-format
+msgid ""
+"Security group %(security_group_id)s is already associated with the "
+"instance %(instance_id)s"
+msgstr ""
+
+#: nova/exception.py:750
+#, python-format
+msgid ""
+"Security group %(security_group_id)s is not associated with the instance "
+"%(instance_id)s"
+msgstr ""
+
+#: nova/exception.py:755
+#, python-format
+msgid "Security group default rule (%rule_id)s not found."
+msgstr ""
+
+#: nova/exception.py:759
+msgid ""
+"Network requires port_security_enabled and subnet associated in order to "
+"apply security groups."
+msgstr ""
+
+#: nova/exception.py:764
+msgid "No Unique Match Found."
+msgstr ""
+
+#: nova/exception.py:769
+#, python-format
+msgid "Migration %(migration_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:773
+#, python-format
+msgid "Migration not found for instance %(instance_id)s with status %(status)s."
+msgstr ""
+
+#: nova/exception.py:778
+#, python-format
+msgid "Console pool %(pool_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:782
+#, python-format
+msgid ""
+"Console pool of type %(console_type)s for compute host %(compute_host)s "
+"on proxy host %(host)s not found."
+msgstr ""
+
+#: nova/exception.py:788
+#, python-format
+msgid "Console %(console_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:792
+#, python-format
+msgid "Console for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:796
+#, python-format
+msgid ""
+"Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
+"found."
+msgstr ""
+
+#: nova/exception.py:801
+#, python-format
+msgid "Invalid console type %(console_type)s"
+msgstr ""
+
+#: nova/exception.py:805
+#, python-format
+msgid "Instance type %(instance_type_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:809
+#, python-format
+msgid "Instance type with name %(instance_type_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:814
+#, python-format
+msgid "Flavor %(flavor_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:818
+#, python-format
+msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
+msgstr ""
+
+#: nova/exception.py:823
+#, python-format
+msgid "Cell %(cell_name)s doesn't exist."
+msgstr ""
+
+#: nova/exception.py:827
+#, python-format
+msgid "Cell with name %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:831
+#, python-format
+msgid "Inconsistency in cell routing: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:835
+#, python-format
+msgid "Service API method not found: %(detail)s"
+msgstr ""
+
+#: nova/exception.py:839
+msgid "Timeout waiting for response from cell"
+msgstr ""
+
+#: nova/exception.py:843
+#, python-format
+msgid "Cell message has reached maximum hop count: %(hop_count)s"
+msgstr ""
+
+#: nova/exception.py:847
+msgid "No cells available matching scheduling criteria."
+msgstr ""
+
+#: nova/exception.py:851
+#, python-format
+msgid "Exception received during cell processing: %(exc_name)s."
+msgstr ""
+
+#: nova/exception.py:855
+#, python-format
+msgid "Cell is not known for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/exception.py:859
+#, python-format
+msgid "Scheduler Host Filter %(filter_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:863
+#, python-format
+msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:868
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:873
+#, python-format
+msgid ""
+"Instance Type %(instance_type_id)s has no extra specs with key "
+"%(extra_specs_key)s."
+msgstr ""
+
+#: nova/exception.py:878
+#, python-format
+msgid "File %(file_path)s could not be found."
+msgstr ""
+
+#: nova/exception.py:882
+msgid "Zero files could be found."
+msgstr ""
+
+#: nova/exception.py:886
+#, python-format
+msgid "Virtual switch associated with the network adapter %(adapter)s not found."
+msgstr ""
+
+#: nova/exception.py:891
+#, python-format
+msgid "Network adapter %(adapter)s could not be found."
+msgstr ""
+
+#: nova/exception.py:895
+#, python-format
+msgid "Class %(class_name)s could not be found: %(exception)s"
+msgstr ""
+
+#: nova/exception.py:899
+msgid "Action not allowed."
+msgstr ""
+
+#: nova/exception.py:903
+msgid "Rotation is not allowed for snapshots"
+msgstr ""
+
+#: nova/exception.py:907
+msgid "Rotation param is required for backup image_type"
+msgstr ""
+
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
+#, python-format
+msgid "Key pair '%(key_name)s' already exists."
+msgstr ""
+
+#: nova/exception.py:915
+#, python-format
+msgid "Instance %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:919
+#, python-format
+msgid "Instance Type with name %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:923
+#, python-format
+msgid "Instance Type with ID %(flavor_id)s already exists."
+msgstr ""
+
+#: nova/exception.py:927
+#, python-format
+msgid ""
+"Flavor access already exists for flavor %(flavor_id)s and project "
+"%(project_id)s combination."
+msgstr ""
+
+#: nova/exception.py:932
+#, python-format
+msgid "%(path)s is not on shared storage: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:936
+#, python-format
+msgid "%(path)s is not on local storage: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:940
+msgid "Migration error"
+msgstr ""
+
+#: nova/exception.py:944
+msgid "Migration pre-check error"
+msgstr ""
+
+#: nova/exception.py:948
+#, python-format
+msgid "Malformed message body: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:954
+#, python-format
+msgid "Could not find config at %(path)s"
+msgstr ""
+
+#: nova/exception.py:958
+#, python-format
+msgid "Could not load paste app '%(name)s' from %(path)s"
+msgstr ""
+
+#: nova/exception.py:962
+msgid "When resizing, instances must change flavor!"
+msgstr ""
+
+#: nova/exception.py:966
+#, python-format
+msgid "Resize error: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:970
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:974
+msgid "Instance type's memory is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:978
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:982
+#, python-format
+msgid "Insufficient free memory on compute node to start %(uuid)s."
+msgstr ""
+
+#: nova/exception.py:986
+msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
+msgstr ""
+
+#: nova/exception.py:990
+#, python-format
+msgid "No valid host was found. %(reason)s"
+msgstr ""
+
+#: nova/exception.py:994
+msgid "Quota exceeded"
+msgstr ""
+
+#: nova/exception.py:1001
+#, python-format
+msgid ""
+"Quota exceeded for %(overs)s: Requested %(req)s, but already used "
+"%(used)d of %(allowed)d %(resource)s"
+msgstr ""
+
+#: nova/exception.py:1006
+msgid "Maximum number of floating ips exceeded"
+msgstr ""
+
+#: nova/exception.py:1010
+msgid "Maximum number of fixed ips exceeded"
+msgstr ""
+
+#: nova/exception.py:1014
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:1018
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:1022
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:1026
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1034
+msgid "Maximum number of security groups or rules exceeded"
+msgstr ""
+
+#: nova/exception.py:1038
+#, python-format
+msgid ""
+"Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
+"%(reason)s."
+msgstr ""
+
+#: nova/exception.py:1043
+#, python-format
+msgid "Aggregate %(aggregate_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1047
+#, python-format
+msgid "Aggregate %(aggregate_name)s already exists."
+msgstr ""
+
+#: nova/exception.py:1051
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no host %(host)s."
+msgstr ""
+
+#: nova/exception.py:1055
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:1060
+#, python-format
+msgid "Aggregate %(aggregate_id)s already has host %(host)s."
+msgstr ""
+
+#: nova/exception.py:1064
+msgid "Unable to create instance type"
+msgstr ""
+
+#: nova/exception.py:1068
+#, python-format
+msgid "Failed to set admin password on %(instance)s because %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1074
+#, python-format
+msgid "Detected existing vlan with id %(vlan)d"
+msgstr ""
+
+#: nova/exception.py:1078
+msgid "There was a conflict when trying to complete your request."
+msgstr ""
+
+#: nova/exception.py:1083
+#, python-format
+msgid "Instance %(instance_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1087
+#, python-format
+msgid "Info cache for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1092
+#, python-format
+msgid "Node %(node_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1096
+#, python-format
+msgid "Node with UUID %(node_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1100
+#, python-format
+msgid "Marker %(marker)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1104
+#, python-format
+msgid "Invalid id: %(val)s (expecting \"i-...\")."
+msgstr ""
+
+#: nova/exception.py:1108
+#, python-format
+msgid "Could not fetch image %(image_id)s"
+msgstr ""
+
+#: nova/exception.py:1112
+#, python-format
+msgid "Could not upload image %(image_id)s"
+msgstr ""
+
+#: nova/exception.py:1116
+#, python-format
+msgid "Task %(task_name)s is already running on host %(host)s"
+msgstr ""
+
+#: nova/exception.py:1120
+#, python-format
+msgid "Task %(task_name)s is not running on host %(host)s"
+msgstr ""
+
+#: nova/exception.py:1124
+#, python-format
+msgid "Instance %(instance_uuid)s is locked"
+msgstr ""
+
+#: nova/exception.py:1128
+#, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
+msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
+msgstr ""
+
+#: nova/exception.py:1137
+#, python-format
+msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
+msgstr ""
+
+#: nova/exception.py:1142
+#, python-format
+msgid "Failed to attach network adapter device to %(instance)s"
+msgstr ""
+
+#: nova/exception.py:1146
+#, python-format
+msgid "Failed to detach network adapter device from  %(instance)s"
+msgstr ""
+
+#: nova/exception.py:1150
+#, python-format
+msgid ""
+"User data too large. User data must be no larger than %(maxsize)s bytes "
+"once base64 encoded. Your data is %(length)d bytes"
+msgstr ""
+
+#: nova/exception.py:1156
+msgid "User data needs to be valid base 64."
+msgstr ""
+
+#: nova/exception.py:1160
+#, python-format
+msgid ""
+"unexpected task state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1165
+#, python-format
+msgid ""
+"Action for request_id %(request_id)s on instance %(instance_uuid)s not "
+"found"
+msgstr ""
+
+#: nova/exception.py:1170
+#, python-format
+msgid "Event %(event)s not found for action id %(action_id)s"
+msgstr ""
+
+#: nova/exception.py:1174
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1179
+#, python-format
+msgid "The CA file for %(project)s could not be found"
+msgstr ""
+
+#: nova/exception.py:1183
+#, python-format
+msgid "The CRL file for %(project)s could not be found"
+msgstr ""
+
+#: nova/exception.py:1187
+msgid "Instance recreate is not implemented by this virt driver."
+msgstr ""
+
+#: nova/exception.py:1191
+#, python-format
+msgid ""
+"The service from servicegroup driver %(driver)s is temporarily "
+"unavailable."
+msgstr ""
+
+#: nova/exception.py:1196
+#, python-format
+msgid "%(binary)s attempted direct database access which is not allowed by policy"
+msgstr ""
+
+#: nova/exception.py:1201
+#, python-format
+msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
+msgstr ""
+
+#: nova/exception.py:1206
+#, python-format
+msgid ""
+"Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
+"driver"
+msgstr ""
+
+#: nova/exception.py:1211
+#, python-format
+msgid "Invalid Base 64 data for file %(path)s"
+msgstr ""
+
+#: nova/exception.py:1215
+#, python-format
+msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1219
+#, python-format
+msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1224
+#, python-format
+msgid "Shadow table with name %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:1229
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
+#: nova/exception.py:1235
+#, python-format
+msgid "Unsupported object type %(objtype)s"
+msgstr ""
+
+#: nova/exception.py:1239
+#, python-format
+msgid "Cannot call %(method)s on orphaned %(objtype)s object"
+msgstr ""
+
+#: nova/exception.py:1243
+#, python-format
+msgid "Version %(objver)s of %(objname)s is not supported"
+msgstr ""
+
+#: nova/exception.py:1247
+#, python-format
+msgid "Core API extensions are missing: %(missing_apis)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1255
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1264
+#, python-format
+msgid "Instance group %(group_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1268
+#, python-format
+msgid "Instance group %(group_uuid)s already exists."
+msgstr ""
+
+#: nova/exception.py:1272
+#, python-format
+msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:1277
+#, python-format
+msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
+msgstr ""
+
+#: nova/exception.py:1282
+#, python-format
+msgid "Instance group %(group_uuid)s has no policy %(policy)s."
+msgstr ""
+
+#: nova/hooks.py:62
+#, python-format
+msgid "Running %(name)s pre-hook: %(obj)s"
+msgstr ""
+
+#: nova/hooks.py:70
+#, python-format
+msgid "Running %(name)s post-hook: %(obj)s"
+msgstr ""
+
+#: nova/manager.py:162
+msgid "Notifying Schedulers of capabilities ..."
+msgstr ""
+
+#: nova/notifications.py:116 nova/notifications.py:156
+msgid "Failed to send state update notification"
+msgstr ""
+
+#: nova/notifications.py:241
+msgid "Failed to get nw_info"
+msgstr ""
+
+#: nova/policy.py:32
+msgid "JSON file representing policy"
+msgstr ""
+
+#: nova/policy.py:35
+msgid "Rule checked when requested rule is not found"
+msgstr ""
+
+#: nova/quota.py:972
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:994
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:997
+#, python-format
+msgid "Committed reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:1017
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:1020
+#, python-format
+msgid "Rolled back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:153
+#, python-format
+msgid "Starting %(topic)s node (version %(version)s)"
+msgstr ""
+
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
+#, python-format
+msgid "Creating Consumer connection for Service %s"
+msgstr ""
+
+#: nova/service.py:190
+#, python-format
+msgid "Join ServiceGroup membership for this service %s"
+msgstr ""
+
+#: nova/service.py:270
+msgid "Service killed that has no database entry"
+msgstr ""
+
+#: nova/service.py:292
+#, python-format
+msgid "Temporary directory is invalid: %s"
+msgstr ""
+
+#: nova/service.py:394
+msgid "serve() can only be called once"
+msgstr ""
+
+#: nova/utils.py:150
+#, python-format
+msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
+msgstr ""
+
+#: nova/utils.py:178
+#, python-format
+msgid "debug in callback: %s"
+msgstr ""
+
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
+#, python-format
+msgid "Link Local address is not found.:%s"
+msgstr ""
+
+#: nova/utils.py:400
+#, python-format
+msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgstr ""
+
+#: nova/utils.py:439
+#, python-format
+msgid "Invalid backend: %s"
+msgstr ""
+
+#: nova/utils.py:589
+#, python-format
+msgid "Expected object of type: %s"
+msgstr ""
+
+#: nova/utils.py:618
+#, python-format
+msgid "Invalid server_string: %s"
+msgstr ""
+
+#: nova/utils.py:760
+#, python-format
+msgid "timefunc: '%(name)s' took %(total_time).2f secs"
+msgstr ""
+
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
+#, python-format
+msgid "Reloading cached file %s"
+msgstr ""
+
+#: nova/utils.py:936 nova/virt/configdrive.py:177
+#, python-format
+msgid "Could not remove tmpdir: %s"
+msgstr ""
+
+#: nova/utils.py:1103
+#, python-format
+msgid "%s is not a string or unicode"
+msgstr ""
+
+#: nova/utils.py:1107
+#, python-format
+msgid "%(name)s has less than %(min_length)s characters."
+msgstr ""
+
+#: nova/utils.py:1112
+#, python-format
+msgid "%(name)s has more than %(max_length)s characters."
+msgstr ""
+
+#: nova/wsgi.py:125
+#, python-format
+msgid "%(name)s listening on %(host)s:%(port)s"
+msgstr ""
+
+#: nova/wsgi.py:140
+#, python-format
+msgid "Unable to find cert_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:144
+#, python-format
+msgid "Unable to find ca_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:148
+#, python-format
+msgid "Unable to find key_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:152
+msgid ""
+"When running server in SSL mode, you must specify both a cert_file and "
+"key_file option value in your configuration file"
+msgstr ""
+
+#: nova/wsgi.py:183
+#, python-format
+msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
+msgstr ""
+
+#: nova/wsgi.py:210
+msgid "Stopping WSGI server."
+msgstr ""
+
+#: nova/wsgi.py:228
+msgid "WSGI server has stopped."
+msgstr ""
+
+#: nova/wsgi.py:297
+msgid "You must implement __call__"
+msgstr ""
+
+#: nova/wsgi.py:483
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
+#: nova/api/auth.py:116
+msgid "Invalid service catalog json."
+msgstr ""
+
+#: nova/api/auth.py:139
+msgid "Sourcing roles from deprecated X-Role HTTP header"
+msgstr ""
+
+#: nova/api/sizelimit.py:53 nova/api/sizelimit.py:62 nova/api/sizelimit.py:76
+#: nova/api/metadata/password.py:61
+msgid "Request is too large."
+msgstr ""
+
+#: nova/api/validator.py:131
+#, python-format
+msgid "%(key)s with value %(value)s failed validator %(name)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:81
+#, python-format
+msgid "%(code)s: %(message)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:104
+#, python-format
+msgid "FaultWrapper: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:175
+msgid "Too many failed authentications."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:184
+#, python-format
+msgid ""
+"Access key %(access_key)s has had %(failures)d failed authentications and"
+" will be locked out for %(lock_mins)d minutes."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:203
+msgid "Signature not provided"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:207
+msgid "Access key not provided"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
+msgid "Failure communicating with keystone"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:256
+#, python-format
+msgid "Keystone failure: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:316
+msgid "Timestamp failed validation."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:336
+#, python-format
+msgid "action: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:338
+#, python-format
+msgid "arg: %(key)s\t\tval: %(value)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:414
+#, python-format
+msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:488
+#, python-format
+msgid "InstanceNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:494
+#, python-format
+msgid "VolumeNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:500
+#, python-format
+msgid "SnapshotNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:506
+#, python-format
+msgid "NotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:515
+#, python-format
+msgid "KeyPairExists raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:520
+#, python-format
+msgid "InvalidKeypair raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:525
+#, python-format
+msgid "InvalidParameterValue raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:529
+#, python-format
+msgid "InvalidPortRange raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:533
+#, python-format
+msgid "NotAuthorized raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:537
+#, python-format
+msgid "InvalidRequest raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:541
+#, python-format
+msgid "QuotaError raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:545
+#, python-format
+msgid "Invalid id: bogus (expecting \"i-...\"): %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:554
+#, python-format
+msgid "Unexpected error raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:555
+#, python-format
+msgid "Environment: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
+msgid "An unknown error has occurred. Please try your request again."
+msgstr ""
+
+#: nova/api/ec2/apirequest.py:61
+#, python-format
+msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:401
+#, python-format
+msgid "Create snapshot of volume %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:426
+#, python-format
+msgid "Could not find key pair(s): %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:443
+#, python-format
+msgid "Create key pair %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
+#: nova/api/openstack/compute/contrib/keypairs.py:93
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:459
+#, python-format
+msgid "Import key %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:479
+#, python-format
+msgid "Delete key pair %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:626
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:633
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
+msgid "No rule for the specified parameters."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:686
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:769
+#, python-format
+msgid "Get console output for instance %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:840
+#, python-format
+msgid "Create volume from snapshot %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
+#, python-format
+msgid "Create volume of %s GB"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:871
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:884
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:895
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
+#, python-format
+msgid "Detach volume %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:924
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
+#, python-format
+msgid "attribute not supported: %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1082
+#, python-format
+msgid "vol = %s\n"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1242
+msgid "Allocate address"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1246
+msgid "No more floating IPs available"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1250
+#, python-format
+msgid "Release address %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1255
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1258
+#, python-format
+msgid "Associate address %(public_ip)s to instance %(instance_id)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1268
+msgid "Unable to associate IP Address, no fixed_ips."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1276
+#: nova/api/openstack/compute/contrib/floating_ips.py:248
+#, python-format
+msgid "multiple fixed_ips exist, using the first: %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1285
+msgid "Floating ip is already associated."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1288
+msgid "l3driver call to add floating ip failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1291
+msgid "Error, unable to associate floating ip."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1299
+#, python-format
+msgid "Disassociate address %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1304
+msgid "Floating ip is not associated."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1334
+msgid "Image must be available"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1372
+msgid "Going to start terminating instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1382
+#, python-format
+msgid "Reboot instance %r"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1392
+msgid "Going to stop instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1402
+msgid "Going to start instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1493
+#, python-format
+msgid "De-registering image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1509
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1528
+#, python-format
+msgid "Registered image %(image_location)s with id %(image_id)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1591
+msgid "user or group not specified"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1593
+msgid "only group \"all\" is supported"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1595
+msgid "operation_type must be add or remove"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1597
+#, python-format
+msgid "Updating image %s publicity"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1610
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1638
+#, python-format
+msgid ""
+"Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
+"have a volume attached at root (%(root)s)"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1670
+#, python-format
+msgid "Couldn't stop instance with in %d sec"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1688
+#, python-format
+msgid "image of %(instance)s at %(now)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
+msgid "resource_id and tag are required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+msgid "Expecting a list of resources"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
+msgid "Only instances implemented"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+msgid "Expecting a list of tagSets"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1780
+msgid "Expecting key to be set"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1853
+msgid "Invalid CIDR"
+msgstr ""
+
+#: nova/api/ec2/ec2utils.py:249
+msgid "Request must include either Timestamp or Expires, but cannot contain both"
+msgstr ""
+
+#: nova/api/ec2/ec2utils.py:267
+msgid "Timestamp is invalid."
+msgstr ""
+
+#: nova/api/metadata/handler.py:108
+msgid ""
+"X-Instance-ID present in request headers. The "
+"'service_quantum_metadata_proxy' option must be enabled to process this "
+"header."
+msgstr ""
+
+#: nova/api/metadata/handler.py:134 nova/api/metadata/handler.py:141
+#, python-format
+msgid "Failed to get metadata for ip: %s"
+msgstr ""
+
+#: nova/api/metadata/handler.py:153
+msgid "X-Instance-ID header is missing from request."
+msgstr ""
+
+#: nova/api/metadata/handler.py:155
+msgid "Multiple X-Instance-ID headers found within request."
+msgstr ""
+
+#: nova/api/metadata/handler.py:169
+#, python-format
+msgid ""
+"X-Instance-ID-Signature: %(signature)s does not match the expected value:"
+" %(expected_signature)s for id: %(instance_id)s.  Request From: "
+"%(remote_address)s"
+msgstr ""
+
+#: nova/api/metadata/handler.py:178
+msgid "Invalid proxy request signature."
+msgstr ""
+
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
+#, python-format
+msgid "Failed to get metadata for instance id: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:79
+#, python-format
+msgid "Caught error: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:88
+#, python-format
+msgid "%(url)s returned with HTTP %(status)d"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:175
+msgid "Must specify an ExtensionManager class"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:186 nova/api/openstack/__init__.py:349
+#, python-format
+msgid "Extended resource: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:221 nova/api/openstack/__init__.py:396
+#, python-format
+msgid ""
+"Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
+"resource"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:226 nova/api/openstack/__init__.py:401
+#, python-format
+msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:269
+#, python-format
+msgid "Not loading %s because it is in the blacklist"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:274
+#, python-format
+msgid "Not loading %s because it is not in the whitelist"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:285
+#, python-format
+msgid "v3 API Extension Blacklist: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:287
+#, python-format
+msgid "v3 API Extension Whitelist: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:294
+#, python-format
+msgid "Extensions in both blacklist and whitelist: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:318
+#, python-format
+msgid "Missing core API extensions: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:346
+#, python-format
+msgid "Running _register_resources on %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:388
+#, python-format
+msgid "Running _register_controllers on %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:114
+#, python-format
+msgid ""
+"status is UNKNOWN from vm_state=%(vm_state)s task_state=%(task_state)s. "
+"Bad upgrade or db corrupted?"
+msgstr ""
+
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
+msgid "limit param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
+msgid "limit param must be positive"
+msgstr ""
+
+#: nova/api/openstack/common.py:182
+msgid "offset param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:196
+msgid "offset param must be positive"
+msgstr ""
+
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/plugins/v3/servers.py:598
+#, python-format
+msgid "marker [%s] not found"
+msgstr ""
+
+#: nova/api/openstack/common.py:271
+#, python-format
+msgid "href %s does not contain version"
+msgstr ""
+
+#: nova/api/openstack/common.py:286
+msgid "Image metadata limit exceeded"
+msgstr ""
+
+#: nova/api/openstack/common.py:294
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:297
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:300
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:363
+#, python-format
+msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:366
+#, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
+msgid "Instance is in an invalid state for '%s'"
+msgstr ""
+
+#: nova/api/openstack/common.py:449
+msgid "Rejecting snapshot request, snapshots currently disabled"
+msgstr ""
+
+#: nova/api/openstack/common.py:451
+msgid "Instance snapshots are not permitted at this time."
+msgstr ""
+
+#: nova/api/openstack/extensions.py:197
+#, python-format
+msgid "Loaded extension: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/compute/plugins/__init__.py:46
+#, python-format
+msgid "Ext name: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/compute/plugins/__init__.py:47
+#, python-format
+msgid "Ext alias: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:238
+#: nova/api/openstack/compute/plugins/__init__.py:48
+#, python-format
+msgid "Ext description: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/compute/plugins/__init__.py:50
+#, python-format
+msgid "Ext namespace: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:241
+#, python-format
+msgid "Ext updated: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:243
+#: nova/api/openstack/compute/plugins/__init__.py:53
+#, python-format
+msgid "Exception loading extension: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:257
+#, python-format
+msgid "Loading extension %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:266
+#, python-format
+msgid "Calling extension factory %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:278
+#, python-format
+msgid "Failed to load extension %(ext_factory)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:349
+#, python-format
+msgid "Failed to load extension %(classpath)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:372
+#, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
+msgid "cannot understand JSON"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:631
+msgid "too many body keys"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:675
+#, python-format
+msgid "Exception handling resource: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:679
+#, python-format
+msgid "Fault thrown: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:682
+#, python-format
+msgid "HTTP exception thrown: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:796
+msgid "Unrecognized Content-Type provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:800
+msgid "No Content-Type provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:804
+msgid "Empty body provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:912
+#, python-format
+msgid "There is no such action: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:935
+#: nova/api/openstack/compute/server_metadata.py:58
+#: nova/api/openstack/compute/server_metadata.py:76
+#: nova/api/openstack/compute/server_metadata.py:101
+#: nova/api/openstack/compute/server_metadata.py:126
+#: nova/api/openstack/compute/contrib/admin_actions.py:211
+#: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
+msgid "Malformed request body"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:919
+#, python-format
+msgid "Action: '%(action)s', body: %(body)s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:923
+#, python-format
+msgid "Calling method %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:932
+msgid "Unsupported Content-Type"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:944
+#, python-format
+msgid ""
+"Malformed request URL: URL's project_id '%(project_id)s' doesn't match "
+"Context's project_id '%(context_project_id)s'"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:1181
+#, python-format
+msgid "Returning %(code)s to user: %(explanation)s"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:270
+msgid "element is not a child"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:419
+msgid "root element selecting a list"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:742
+#, python-format
+msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:862
+msgid "subclasses must implement construct()!"
+msgstr ""
+
+#: nova/api/openstack/compute/extensions.py:38
+msgid "Initializing extension manager."
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
+#, python-format
+msgid "Invalid is_public filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:36
+#: nova/api/openstack/compute/images.py:141
+#: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
+msgid "Image not found."
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:76
+msgid "Incorrect request body format"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:80
+#: nova/api/openstack/compute/server_metadata.py:80
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:85
+msgid "Request body and URI mismatch"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/server_metadata.py:84
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:88
+msgid "Request body contains too many items"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:109
+msgid "Invalid metadata key"
+msgstr ""
+
+#: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
+msgid "You are not allowed to delete the image."
+msgstr ""
+
+#: nova/api/openstack/compute/ips.py:68
+#: nova/api/openstack/compute/plugins/v3/ips.py:69
+msgid "Instance does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/ips.py:91
+#: nova/api/openstack/compute/plugins/v3/ips.py:92
+msgid "Instance is not a member of specified network"
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:148
+#, python-format
+msgid ""
+"Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
+"%(unit_string)s."
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:276
+msgid "This request was rate-limited."
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:38
+#: nova/api/openstack/compute/server_metadata.py:122
+#: nova/api/openstack/compute/server_metadata.py:173
+msgid "Server does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:154
+#: nova/api/openstack/compute/server_metadata.py:165
+msgid "Metadata item was not found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:521
+#: nova/api/openstack/compute/contrib/cells.py:317
+#: nova/api/openstack/compute/plugins/v3/servers.py:563
+msgid "Invalid changes-since value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/plugins/v3/servers.py:582
+msgid "Only administrators may list deleted instances"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:559
+#: nova/api/openstack/compute/plugins/v3/servers.py:601
+#, python-format
+msgid "Flavor '%s' could not be found "
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
+#: nova/api/openstack/compute/plugins/v3/servers.py:618
+#: nova/api/openstack/compute/plugins/v3/servers.py:785
+#: nova/api/openstack/compute/plugins/v3/servers.py:1090
+#: nova/api/openstack/compute/plugins/v3/servers.py:1198
+#: nova/api/openstack/compute/plugins/v3/servers.py:1377
+msgid "Instance could not be found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:597
+#: nova/api/openstack/compute/plugins/v3/servers.py:637
+msgid "Device name cannot include spaces."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:614
+#: nova/api/openstack/compute/plugins/v3/servers.py:654
+#, python-format
+msgid "Bad personality format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:617
+#: nova/api/openstack/compute/plugins/v3/servers.py:657
+msgid "Bad personality format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:620
+#: nova/api/openstack/compute/plugins/v3/servers.py:660
+#, python-format
+msgid "Personality content for %s cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:651
+#: nova/api/openstack/compute/plugins/v3/servers.py:691
+msgid "Unknown argment : port"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:654
+#: nova/api/openstack/compute/plugins/v3/servers.py:694
+#, python-format
+msgid "Bad port format: port uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:664
+#: nova/api/openstack/compute/plugins/v3/servers.py:704
+#, python-format
+msgid "Bad networks format: network uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:674
+#: nova/api/openstack/compute/plugins/v3/servers.py:714
+#, python-format
+msgid "Invalid fixed IP address (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:687
+#: nova/api/openstack/compute/plugins/v3/servers.py:727
+#, python-format
+msgid "Duplicate networks (%s) are not allowed"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:693
+#: nova/api/openstack/compute/plugins/v3/servers.py:733
+#, python-format
+msgid "Bad network format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:696
+#: nova/api/openstack/compute/servers.py:797
+#: nova/api/openstack/compute/plugins/v3/servers.py:736
+msgid "Bad networks format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:722
+#: nova/api/openstack/compute/plugins/v3/servers.py:762
+msgid "Userdata content cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/plugins/v3/servers.py:767
+msgid "accessIPv4 is not proper IPv4 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:732
+#: nova/api/openstack/compute/plugins/v3/servers.py:772
+msgid "accessIPv6 is not proper IPv6 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:761
+#: nova/api/openstack/compute/plugins/v3/servers.py:801
+msgid "Server name is not defined"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:813
+#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/plugins/v3/servers.py:876
+#: nova/api/openstack/compute/plugins/v3/servers.py:993
+msgid "Invalid flavorRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:854
+#: nova/api/openstack/compute/plugins/v3/servers.py:924
+msgid "min_count must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/plugins/v3/servers.py:927
+msgid "min_count must be > 0"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/plugins/v3/servers.py:933
+msgid "max_count must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:866
+#: nova/api/openstack/compute/plugins/v3/servers.py:936
+msgid "max_count must be > 0"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/plugins/v3/servers.py:940
+msgid "min_count must be <= max_count"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/plugins/v3/servers.py:990
+msgid "Can not find requested image"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:920
+#: nova/api/openstack/compute/plugins/v3/servers.py:996
+msgid "Invalid key_name provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/plugins/v3/servers.py:1078
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/plugins/v3/servers.py:1082
+msgid "Personality cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/plugins/v3/servers.py:1108
+#: nova/api/openstack/compute/plugins/v3/servers.py:1125
+msgid "Instance has not been resized."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+msgid "Flavor used by the instance could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/plugins/v3/servers.py:1144
+msgid "Argument 'type' for reboot is not HARD or SOFT"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/plugins/v3/servers.py:1148
+msgid "Missing argument 'type' for reboot"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/plugins/v3/servers.py:1170
+msgid "Unable to locate requested flavor."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/plugins/v3/servers.py:1173
+msgid "Resize requires a flavor change."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/plugins/v3/servers.py:1179
+msgid "You are not authorized to access the image the instance was started with."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1104
+#: nova/api/openstack/compute/plugins/v3/servers.py:1183
+msgid "Image that the instance was started with could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1108
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
+msgid "Invalid instance image."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1129
+#: nova/api/openstack/compute/plugins/v3/servers.py:1208
+msgid "Missing imageRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/plugins/v3/servers.py:1217
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1165
+#: nova/api/openstack/compute/plugins/v3/servers.py:1250
+msgid "Missing flavorRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1178
+#: nova/api/openstack/compute/plugins/v3/servers.py:1263
+msgid "No adminPass was specified"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
+#: nova/api/openstack/compute/plugins/v3/servers.py:1267
+#: nova/api/openstack/compute/plugins/v3/servers.py:1476
+msgid "Invalid adminPass"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1188
+#: nova/api/openstack/compute/plugins/v3/servers.py:1273
+msgid "Unable to set password on instance"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1197
+#: nova/api/openstack/compute/plugins/v3/servers.py:1282
+msgid "Unable to parse metadata key/value pairs."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/plugins/v3/servers.py:1295
+msgid "Resize request has invalid 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1213
+#: nova/api/openstack/compute/plugins/v3/servers.py:1298
+msgid "Resize requests require 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1231
+#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
+#: nova/api/openstack/compute/contrib/keypairs.py:78
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
+#: nova/api/openstack/compute/plugins/v3/servers.py:1316
+msgid "Invalid request body"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1237
+#: nova/api/openstack/compute/plugins/v3/servers.py:1322
+msgid "Could not parse imageRef from request."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1298
+#: nova/api/openstack/compute/plugins/v3/servers.py:1383
+msgid "Cannot find image for rebuild"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/plugins/v3/servers.py:1417
+msgid "createImage entity requires name attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1417
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
+#, python-format
+msgid "Removing options '%s' from query"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:60
+#, python-format
+msgid "Compute.api::pause %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:77
+#, python-format
+msgid "Compute.api::unpause %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:94
+#, python-format
+msgid "compute.api::suspend %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:111
+#, python-format
+msgid "compute.api::resume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:127
+#, python-format
+msgid "Error in migrate %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:141
+#, python-format
+msgid "Compute.api::reset_network %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:154
+#: nova/api/openstack/compute/contrib/admin_actions.py:170
+#: nova/api/openstack/compute/contrib/admin_actions.py:186
+#: nova/api/openstack/compute/contrib/admin_actions.py:321
+#: nova/api/openstack/compute/contrib/multinic.py:41
+#: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
+msgid "Server not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:157
+#, python-format
+msgid "Compute.api::inject_network_info %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:173
+#, python-format
+msgid "Compute.api::lock %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:189
+#, python-format
+msgid "Compute.api::unlock %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:219
+#, python-format
+msgid "createBackup entity requires %s attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:223
+msgid "Malformed createBackup entity"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:229
+msgid "createBackup attribute 'rotation' must be an integer"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:232
+msgid "createBackup attribute 'rotation' must be greater than or equal to zero"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:248
+#: nova/api/openstack/compute/contrib/console_output.py:45
+#: nova/api/openstack/compute/contrib/server_diagnostics.py:47
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
+msgid "Instance not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:278
+msgid "host and block_migration must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:292
+#, python-format
+msgid "Live migration of instance %s to another host failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:295
+#, python-format
+msgid "Live migration of instance %(id)s to host %(host)s failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:313
+#, python-format
+msgid "Desired state must be specified.  Valid states are: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:324
+#, python-format
+msgid "Compute.api::resetState %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:89
+#, python-format
+msgid "Cannot show aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:115
+#, python-format
+msgid "Cannot update aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:127
+#, python-format
+msgid "Cannot delete aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:140
+#, python-format
+msgid "Aggregates does not have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:153
+#: nova/api/openstack/compute/contrib/aggregates.py:158
+#, python-format
+msgid "Cannot add host %(host)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:172
+#: nova/api/openstack/compute/contrib/aggregates.py:176
+#, python-format
+msgid "Cannot remove host %(host)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:196
+#, python-format
+msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:102
+msgid "Attach interface"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:109
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:142
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:165
+msgid "Network driver does not support this function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:113
+msgid "Failed to attach interface"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:121
+msgid "Attachments update is not supported"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:132
+#, python-format
+msgid "Detach interface %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
+msgid "Must specify id or address"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:210
+#, python-format
+msgid "Cell %(id)s not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:238
+msgid "Cell name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:242
+msgid "Cell name cannot contain '!' or '.'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:249
+msgid "Cell type must be 'parent' or 'child'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:269
+#: nova/api/openstack/compute/contrib/cells.py:289
+msgid "No cell information in request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:274
+msgid "No cell name in request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:311
+msgid "Only 'updated_since' and 'project_id' are understood."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
+msgid "Only root certificate can be retrieved."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cloudpipe.py:149
+msgid ""
+"Unable to claim IP for VPN instances, ensure it isn't running, and try "
+"again in a few minutes"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cloudpipe_update.py:41
+#, python-format
+msgid "Unknown action %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:50
+msgid "os-getConsoleOutput malformed or missing from request body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:57
+msgid "Length in request body must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:65
+msgid "Unable to get console"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/consoles.py:51
+msgid "Instance not yet ready"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:97
+#, python-format
+msgid "Can't connect to service: %s, no portspecified\n"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:116
+msgid "Coverage begin"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
+msgid "Coverage not running"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
+msgid "Invalid path"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
+msgid "No path given for report file"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
+msgid "You can't use html reports without combining"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
+#, python-format
+msgid "Directory conflict: %s already exists"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
+msgid "Python coverage module is not installed."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
+#, python-format
+msgid "Coverage doesn't have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/disk_config.py:43
+#, python-format
+msgid "%s must be either 'MANUAL' or 'AUTO'."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
+msgid "admin password can't be changed on existing disk"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
+msgid "host and onSharedStorage must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
+#, python-format
+msgid "Error in evacuate, %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fixed_ips.py:40
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
+#, python-format
+msgid "Fixed IP %s has been deleted"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
+#, python-format
+msgid "Fixed IP %s not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:76
+#: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
+msgid "Flavor not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
+msgid "Access list not available for public flavors."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
+msgid "No request body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:55
+msgid "No Request Body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ip_dns.py:223
+msgid "DNS entries not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:129
+#: nova/api/openstack/compute/contrib/floating_ips.py:177
+#, python-format
+msgid "Floating ip not found for id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:162
+#, python-format
+msgid "No more floating ips in pool %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:164
+msgid "No more floating ips available."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:189
+#, python-format
+msgid "Floating ip %s has been disassociated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:216
+#: nova/api/openstack/compute/contrib/floating_ips.py:281
+#: nova/api/openstack/compute/contrib/security_groups.py:457
+msgid "Missing parameter dict"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:219
+#: nova/api/openstack/compute/contrib/floating_ips.py:284
+msgid "Address not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:226
+msgid "No nw_info cache associated with instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:231
+msgid "No fixed ips associated to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:242
+msgid "Specified fixed address not assigned to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:256
+msgid "floating ip is already associated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:259
+msgid "l3driver call to add floating ip failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:263
+#: nova/api/openstack/compute/contrib/floating_ips.py:292
+msgid "floating ip not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:266
+msgid "Error. Unable to associate floating ip"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:307
+msgid "Floating ip is not associated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:311
+#, python-format
+msgid "Floating ip %(address)s is not associated with instance %(id)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
+#: nova/cmd/manage.py:385
+#, python-format
+msgid "/%s should be specified as single address(es) not in cidr format"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fping.py:53
+msgid "fping utility is not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:183
+#, python-format
+msgid "Invalid update setting: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:186
+#, python-format
+msgid "Invalid status: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:188
+#, python-format
+msgid "Invalid mode: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:190
+msgid "'status' or 'maintenance_mode' needed for host update"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:206
+#, python-format
+msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:212
+msgid "Virt driver does not implement host maintenance mode."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:227
+#, python-format
+msgid "Enabling host %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:229
+#, python-format
+msgid "Disabling host %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:234
+msgid "Virt driver does not implement host disabled status."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:250
+msgid "Virt driver does not implement host power management."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:336
+msgid "Describe-resource is admin only functionality"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:183
+#: nova/api/openstack/compute/contrib/hypervisors.py:194
+#, python-format
+msgid "Hypervisor with ID '%s' could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:202
+msgid "Virt driver does not implement uptime function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:218
+#: nova/api/openstack/compute/contrib/hypervisors.py:228
+#, python-format
+msgid "No hypervisor matching '%s' could be found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/instance_usage_audit_log.py:57
+#, python-format
+msgid "Invalid timestamp for date %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:52
+msgid "Missing 'networkId' argument for addFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:68
+msgid "Missing 'address' argument for removeFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:77
+#, python-format
+msgid "Unable to find address %r"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:23
+#, python-format
+msgid "Disassociating host with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:27
+#: nova/api/openstack/compute/contrib/networks_associate.py:38
+#: nova/api/openstack/compute/contrib/networks_associate.py:50
+#: nova/api/openstack/compute/contrib/os_networks.py:79
+#: nova/api/openstack/compute/contrib/os_networks.py:89
+#: nova/api/openstack/compute/contrib/os_networks.py:99
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:110
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:132
+msgid "Network not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:34
+#, python-format
+msgid "Disassociating project with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:74
+#, python-format
+msgid "Disassociating network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:85
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:106
+#, python-format
+msgid "Showing network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:95
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:124
+#, python-format
+msgid "Deleting network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:110
+msgid "Missing network in body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:114
+msgid "Network label is required"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:118
+msgid "Network cidr or cidr_v6 is required"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:120
+#, python-format
+msgid "Creating network with label %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:136
+#, python-format
+msgid "Associating network %(network)s with project %(project)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:144
+msgid "VLAN support must be enabled"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:147
+#, python-format
+msgid "Cannot associate network %(network)s with project %(project)s: %(message)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:121
+msgid "Failed to update usages deallocating network."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:151
+msgid "No CIDR requested"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:157
+msgid "Requested network does not contain enough (2+) usable hosts"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:161
+msgid "CIDR is malformed."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:164
+msgid "Address could not be converted."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:172
+msgid "Quota exceeded, too many networks."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:183
+msgid "Create networks failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
+msgid "Quota limit must be -1 or greater."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
+#, python-format
+msgid "Bad key(s) %s in quota_set"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/scheduler_hints.py:38
+msgid "Malformed scheduler_hints attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
+#: nova/api/openstack/compute/contrib/security_groups.py:371
+msgid "Not enough parameters to build a valid rule."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:133
+msgid "This default rule already exists."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:154
+#, python-format
+msgid "Showing security_group_default_rule with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:158
+msgid "security group default rule not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:379
+#, python-format
+msgid "Bad prefix for network in cidr %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:460
+msgid "Security group not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:464
+msgid "Security group name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
+msgid "start instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
+msgid "stop instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:188
+msgid "Unknown service"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
+msgid "Invalid start time. The start time cannot occur after the end time."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:75
+#, python-format
+msgid "vol=%s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:187
+#, python-format
+msgid "Delete volume with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:380
+#, python-format
+msgid "Bad volumeId format: volumeId is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:399
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:579
+#, python-format
+msgid "Delete snapshot with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:619
+#, python-format
+msgid "Create snapshot from volume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:626
+#, python-format
+msgid "Invalid value '%s' for force."
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/__init__.py:35
+#, python-format
+msgid "Loaded extension %s"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/__init__.py:51
+#, python-format
+msgid "Ext version: %i"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
+#, python-format
+msgid "Reserving IP address %s"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
+#, python-format
+msgid "Unreserving IP address %s"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/servers.py:485
+#, python-format
+msgid "server create extension %s detected"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/servers.py:490
+#, python-format
+msgid "extension %s is missing server_create"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/servers.py:508
+msgid "Did not find any server create extensions"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/servers.py:1031
+#, python-format
+msgid "Running _create_extension_point for %s"
+msgstr ""
+
+#: nova/api/openstack/compute/views/servers.py:176
+msgid "Instance has had its instance_type removed from the DB"
+msgstr ""
+
+#: nova/cells/messaging.py:205
+#, python-format
+msgid "Error processing message locally: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
+#, python-format
+msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
+msgstr ""
+
+#: nova/cells/messaging.py:381
+#, python-format
+msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
+msgstr ""
+
+#: nova/cells/messaging.py:405
+#, python-format
+msgid "Error locating next hop for message: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:432
+#, python-format
+msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:511
+#, python-format
+msgid "Error locating next hops for message: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:531
+#, python-format
+msgid "Error sending message to next hops: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:549
+#, python-format
+msgid "Error waiting for responses from neighbor cells: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:664
+#, python-format
+msgid "Unknown method '%(method)s' in compute API"
+msgstr ""
+
+#: nova/cells/messaging.py:694
+#, python-format
+msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
+msgstr ""
+
+#: nova/cells/messaging.py:704
+#, python-format
+msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
+msgstr ""
+
+#: nova/cells/messaging.py:829
+#, python-format
+msgid "Got update for instance: %(instance)s"
+msgstr ""
+
+#: nova/cells/messaging.py:873
+msgid "Got update to delete instance"
+msgstr ""
+
+#: nova/cells/messaging.py:888
+#, python-format
+msgid "Got broadcast to %(delete_type)s delete instance"
+msgstr ""
+
+#: nova/cells/messaging.py:902
+#, python-format
+msgid "Got message to create instance fault: %(instance_fault)s"
+msgstr ""
+
+#: nova/cells/messaging.py:923
+#, python-format
+msgid ""
+"Forcing a sync of instances, project_id=%(projid_str)s, "
+"updated_since=%(since_str)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
+#, python-format
+msgid "Updating parents with our capabilities: %(capabs)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1182
+#, python-format
+msgid "Updating parents with our capacities: %(capacities)s"
+msgstr ""
+
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
+#: nova/cells/scheduler.py:128
+#, python-format
+msgid "Weighted cells: %(weighted_cells)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:144
+#, python-format
+msgid "Scheduling with routing_path=%(routing_path)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
+#, python-format
+msgid "Couldn't communicate with cell '%s'"
+msgstr ""
+
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
+msgid "Couldn't communicate with any cells"
+msgstr ""
+
+#: nova/cells/scheduler.py:184
+#, python-format
+msgid "Building instances with routing_path=%(routing_path)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:254
+#, python-format
+msgid ""
+"No cells available when scheduling.  Will retry in %(sleep_time)s "
+"second(s)"
+msgstr ""
+
+#: nova/cells/scheduler.py:260
+#, python-format
+msgid "Error scheduling instances %(instance_uuids)s"
+msgstr ""
+
+#: nova/cells/state.py:272
+msgid "Updating cell cache from db."
+msgstr ""
+
+#: nova/cells/state.py:317
+#, python-format
+msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
+msgstr ""
+
+#: nova/cells/state.py:333
+#, python-format
+msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
+msgstr ""
+
+#: nova/cells/filters/target_cell.py:57
+#, python-format
+msgid ""
+"Forcing direct route to %(cell_name)s because of 'target_cell' scheduler "
+"hint"
+msgstr ""
+
+#: nova/cells/weights/mute_child.py:65
+#, python-format
+msgid ""
+"%(cell)s has not been seen since %(last_seen)s and is being treated as "
+"mute."
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:53
+msgid "Template for cloudpipe instance boot script"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:56
+msgid "Network to push into openvpn config"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:59
+msgid "Netmask to push into openvpn config"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:128
+#, python-format
+msgid "Launching VPN for %s"
+msgstr ""
+
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
+#, python-format
+msgid "Failed to load %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:244
+#, python-format
+msgid "start deployment for node %(node_id)s, params %(params)s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:252
+#, python-format
+msgid "deployment to node %s failed"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:256
+#, python-format
+msgid "deployment to node %s done"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
+#, python-format
+msgid "Could not read %s. Re-running with sudo"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1259
+msgid "sudo failed, continuing as if nothing happened"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1261
+msgid "Please re-run nova-manage as root."
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
+msgid "Command failed, please check log for more info"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:46
+msgid "leasing ip"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:66
+msgid "releasing ip"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:121
+#, python-format
+msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:131
+msgid "Environment variable 'NETWORK_ID' must be set."
+msgstr ""
+
+#: nova/cmd/manage.py:206
+msgid ""
+"The above error may show that the database has not been created.\n"
+"Please create a database using 'nova-manage db sync' before running this "
+"command."
+msgstr ""
+
+#: nova/cmd/manage.py:241
+#, python-format
+msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
+msgstr ""
+
+#: nova/cmd/manage.py:247
+msgid "Quota"
+msgstr ""
+
+#: nova/cmd/manage.py:248
+msgid "Limit"
+msgstr ""
+
+#: nova/cmd/manage.py:249
+msgid "In Use"
+msgstr ""
+
+#: nova/cmd/manage.py:250
+msgid "Reserved"
+msgstr ""
+
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
+#, python-format
+msgid "error: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:298
+msgid "network"
+msgstr ""
+
+#: nova/cmd/manage.py:299
+msgid "IP address"
+msgstr ""
+
+#: nova/cmd/manage.py:300
+msgid "hostname"
+msgstr ""
+
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
+msgid "host"
+msgstr ""
+
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
+msgid "No fixed IP found."
+msgstr ""
+
+#: nova/cmd/manage.py:329
+#, python-format
+msgid "WARNING: fixed ip %s allocated to missing instance"
+msgstr ""
+
+#: nova/cmd/manage.py:392
+#, python-format
+msgid ""
+"Too many IP addresses will be generated.  Please increase /%s to reduce "
+"the number generated."
+msgstr ""
+
+#: nova/cmd/manage.py:443
+msgid "No floating IP addresses have been defined."
+msgstr ""
+
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
+msgid "id"
+msgstr ""
+
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
+msgid "IPv4"
+msgstr ""
+
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
+msgid "IPv6"
+msgstr ""
+
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
+msgid "start address"
+msgstr ""
+
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
+msgid "DNS1"
+msgstr ""
+
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
+msgid "DNS2"
+msgstr ""
+
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
+msgid "VlanID"
+msgstr ""
+
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
+#: nova/tests/test_nova_manage.py:219
+msgid "project"
+msgstr ""
+
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
+msgid "uuid"
+msgstr ""
+
+#: nova/cmd/manage.py:520
+msgid "No networks found"
+msgstr ""
+
+#: nova/cmd/manage.py:539
+msgid "Please specify either fixed_range or uuid"
+msgstr ""
+
+#: nova/cmd/manage.py:544
+msgid "UUID is required to delete Quantum Networks"
+msgstr ""
+
+#: nova/cmd/manage.py:547
+msgid "Deleting by fixed_range is not supported with the QuantumManager"
+msgstr ""
+
+#: nova/cmd/manage.py:610
+msgid "instance"
+msgstr ""
+
+#: nova/cmd/manage.py:611
+msgid "node"
+msgstr ""
+
+#: nova/cmd/manage.py:612
+msgid "type"
+msgstr ""
+
+#: nova/cmd/manage.py:613
+msgid "state"
+msgstr ""
+
+#: nova/cmd/manage.py:614
+msgid "launched"
+msgstr ""
+
+#: nova/cmd/manage.py:615
+msgid "image"
+msgstr ""
+
+#: nova/cmd/manage.py:616
+msgid "kernel"
+msgstr ""
+
+#: nova/cmd/manage.py:617
+msgid "ramdisk"
+msgstr ""
+
+#: nova/cmd/manage.py:619
+msgid "user"
+msgstr ""
+
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
+msgid "zone"
+msgstr ""
+
+#: nova/cmd/manage.py:621
+msgid "index"
+msgstr ""
+
+#: nova/cmd/manage.py:665
+msgid "Binary"
+msgstr ""
+
+#: nova/cmd/manage.py:666
+msgid "Host"
+msgstr ""
+
+#: nova/cmd/manage.py:667
+msgid "Zone"
+msgstr ""
+
+#: nova/cmd/manage.py:668
+msgid "Status"
+msgstr ""
+
+#: nova/cmd/manage.py:669
+msgid "State"
+msgstr ""
+
+#: nova/cmd/manage.py:670
+msgid "Updated_At"
+msgstr ""
+
+#: nova/cmd/manage.py:692
+#, python-format
+msgid "Service %(service)s on host %(host)s enabled."
+msgstr ""
+
+#: nova/cmd/manage.py:705
+#, python-format
+msgid "Service %(service)s on host %(host)s disabled."
+msgstr ""
+
+#: nova/cmd/manage.py:772
+msgid "An unexpected error has occurred."
+msgstr ""
+
+#: nova/cmd/manage.py:773
+msgid "[Result]"
+msgstr ""
+
+#: nova/cmd/manage.py:777
+msgid "HOST"
+msgstr ""
+
+#: nova/cmd/manage.py:778
+msgid "PROJECT"
+msgstr ""
+
+#: nova/cmd/manage.py:779
+msgid "cpu"
+msgstr ""
+
+#: nova/cmd/manage.py:780
+msgid "mem(mb)"
+msgstr ""
+
+#: nova/cmd/manage.py:781
+msgid "hdd"
+msgstr ""
+
+#: nova/cmd/manage.py:864
+msgid "Must supply a positive value for max_rows"
+msgstr ""
+
+#: nova/cmd/manage.py:903
+msgid "Must supply valid parameters to create instance_type"
+msgstr ""
+
+#: nova/cmd/manage.py:907
+msgid "Instance Type exists."
+msgstr ""
+
+#: nova/cmd/manage.py:908
+msgid "Please ensure instance_type name and flavorid are unique."
+msgstr ""
+
+#: nova/cmd/manage.py:910
+msgid "Currently defined instance_type names and flavorids:"
+msgstr ""
+
+#: nova/cmd/manage.py:915
+msgid "Unknown error"
+msgstr ""
+
+#: nova/cmd/manage.py:918
+#, python-format
+msgid "%s created"
+msgstr ""
+
+#: nova/cmd/manage.py:926
+msgid "Valid instance type name is required"
+msgstr ""
+
+#: nova/cmd/manage.py:929
+#, python-format
+msgid "DB Error: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:934
+#, python-format
+msgid "%s deleted"
+msgstr ""
+
+#: nova/cmd/manage.py:970
+#, python-format
+msgid "Key %(key)s set to %(value)s on instance type %(name)s"
+msgstr ""
+
+#: nova/cmd/manage.py:992
+#, python-format
+msgid "Key %(key)s on instance type %(name)s unset"
+msgstr ""
+
+#: nova/cmd/manage.py:1037
+#, python-format
+msgid "Hypervisor: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:1078
+#, python-format
+msgid "Line %(linenum)d : %(line)s"
+msgstr ""
+
+#: nova/cmd/manage.py:1080
+msgid "No errors in logfiles!"
+msgstr ""
+
+#: nova/cmd/manage.py:1092
+msgid "Unable to find system log file!"
+msgstr ""
+
+#: nova/cmd/manage.py:1096
+#, python-format
+msgid "Last %s nova syslog entries:-"
+msgstr ""
+
+#: nova/cmd/manage.py:1105
+msgid "No nova entries in syslog!"
+msgstr ""
+
+#: nova/compute/__init__.py:61
+msgid ""
+"The compute_api_class is now deprecated and will be removed in next "
+"release. Please set the cell_type option to api or compute"
+msgstr ""
+
+#: nova/compute/__init__.py:74
+msgid "cell_type must be configured as 'api' or 'compute'"
+msgstr ""
+
+#: nova/compute/api.py:302
+msgid "Cannot run any more instances of this type."
+msgstr ""
+
+#: nova/compute/api.py:309
+#, python-format
+msgid "Can only run %s more instances of this type."
+msgstr ""
+
+#: nova/compute/api.py:318
+#, python-format
+msgid ""
+"%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
+"instances. %(msg)s"
+msgstr ""
+
+#: nova/compute/api.py:338
+#, python-format
+msgid ""
+"Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
+"properties"
+msgstr ""
+
+#: nova/compute/api.py:348
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:352
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:356
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:489
+msgid "Failed to set instance name using multi_instance_display_name_template."
+msgstr ""
+
+#: nova/compute/api.py:571
+msgid "Cannot attach one or more volumes to multiple instances"
+msgstr ""
+
+#: nova/compute/api.py:667
+#, python-format
+msgid "Going to run %s instances..."
+msgstr ""
+
+#: nova/compute/api.py:812
+#, python-format
+msgid "bdm %s"
+msgstr ""
+
+#: nova/compute/api.py:839
+#, python-format
+msgid "block_device_mapping %s"
+msgstr ""
+
+#: nova/compute/api.py:1122
+msgid "instance termination disabled"
+msgstr ""
+
+#: nova/compute/api.py:1258
+#, python-format
+msgid "instance type %(old_inst_type_id)d not found"
+msgstr ""
+
+#: nova/compute/api.py:1264
+msgid "going to delete a resizing instance"
+msgstr ""
+
+#: nova/compute/api.py:1274
+#, python-format
+msgid "instance's host %s is down, deleting from database"
+msgstr ""
+
+#: nova/compute/api.py:1318
+msgid "Going to try to soft delete instance"
+msgstr ""
+
+#: nova/compute/api.py:1343
+msgid "Going to try to terminate instance"
+msgstr ""
+
+#: nova/compute/api.py:1394
+msgid "Going to try to stop instance"
+msgstr ""
+
+#: nova/compute/api.py:1410
+msgid "Going to try to start instance"
+msgstr ""
+
+#: nova/compute/api.py:1482
+#, python-format
+msgid "Searching by: %s"
+msgstr ""
+
+#: nova/compute/api.py:1719
+#, python-format
+msgid "snapshot for %s"
+msgstr ""
+
+#: nova/compute/api.py:2057
+msgid "flavor_id is None. Assuming migration."
+msgstr ""
+
+#: nova/compute/api.py:2066
+#, python-format
+msgid ""
+"Old instance type %(current_instance_type_name)s,  new instance type "
+"%(new_instance_type_name)s"
+msgstr ""
+
+#: nova/compute/api.py:2114
+#, python-format
+msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
+msgstr ""
+
+#: nova/compute/api.py:2253
+msgid "Cannot rescue a volume-backed instance"
+msgstr ""
+
+#: nova/compute/api.py:2358
+msgid "Locking"
+msgstr ""
+
+#: nova/compute/api.py:2366
+msgid "Unlocking"
+msgstr ""
+
+#: nova/compute/api.py:2438
+msgid "Volume must be attached in order to detach."
+msgstr ""
+
+#: nova/compute/api.py:2552
+#, python-format
+msgid "Going to try to live migrate instance to %s"
+msgstr ""
+
+#: nova/compute/api.py:2574
+msgid "vm evacuation scheduled"
+msgstr ""
+
+#: nova/compute/api.py:2578
+#, python-format
+msgid ""
+"Instance compute service state on %(inst_host)s expected to be down, but "
+"it was up."
+msgstr ""
+
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
+#: nova/tests/compute/test_keypairs.py:104
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
+#: nova/compute/api.py:2912
+#, python-format
+msgid "Security group %s is not a string or unicode"
+msgstr ""
+
+#: nova/compute/api.py:2915
+#, python-format
+msgid "Security group %s cannot be empty."
+msgstr ""
+
+#: nova/compute/api.py:2923
+#, python-format
+msgid ""
+"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
+"limited to '%(allowed)'."
+msgstr ""
+
+#: nova/compute/api.py:2929
+#, python-format
+msgid "Security group %s should not be greater than 255 characters."
+msgstr ""
+
+#: nova/compute/api.py:2947
+msgid "Quota exceeded, too many security groups."
+msgstr ""
+
+#: nova/compute/api.py:2950
+#, python-format
+msgid "Create Security Group %s"
+msgstr ""
+
+#: nova/compute/api.py:2957
+#, python-format
+msgid "Security group %s already exists"
+msgstr ""
+
+#: nova/compute/api.py:2976
+#, python-format
+msgid "Unable to update system group '%s'"
+msgstr ""
+
+#: nova/compute/api.py:3036
+#, python-format
+msgid "Unable to delete system group '%s'"
+msgstr ""
+
+#: nova/compute/api.py:3041
+msgid "Security group is still in use"
+msgstr ""
+
+#: nova/compute/api.py:3049
+msgid "Failed to update usages deallocating security group"
+msgstr ""
+
+#: nova/compute/api.py:3052
+#, python-format
+msgid "Delete security group %s"
+msgstr ""
+
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
+#, python-format
+msgid "Rule (%s) not found"
+msgstr ""
+
+#: nova/compute/api.py:3145
+msgid "Quota exceeded, too many security group rules."
+msgstr ""
+
+#: nova/compute/api.py:3148
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/compute/api.py:3157
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/compute/api.py:3210
+msgid "Security group id should be integer"
+msgstr ""
+
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
+#, python-format
+msgid "Aborting claim: %s"
+msgstr ""
+
+#: nova/compute/claims.py:113
+#, python-format
+msgid ""
+"Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d GB, VCPUs "
+"%(vcpus)d"
+msgstr ""
+
+#: nova/compute/claims.py:125
+msgid "Claim successful"
+msgstr ""
+
+#: nova/compute/claims.py:127
+msgid "Claim failed"
+msgstr ""
+
+#: nova/compute/claims.py:132
+msgid "Memory"
+msgstr ""
+
+#: nova/compute/claims.py:141
+msgid "Disk"
+msgstr ""
+
+#: nova/compute/claims.py:150
+msgid "CPU"
+msgstr ""
+
+#: nova/compute/claims.py:162
+#, python-format
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
+msgstr ""
+
+#: nova/compute/claims.py:169
+#, python-format
+msgid "%(type)s limit not specified, defaulting to unlimited"
+msgstr ""
+
+#: nova/compute/claims.py:176
+#, python-format
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
+msgstr ""
+
+#: nova/compute/claims.py:184
+#, python-format
+msgid ""
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
+msgstr ""
+
+#: nova/compute/flavors.py:92
+msgid "names can only contain [a-zA-Z0-9_.- ]"
+msgstr ""
+
+#: nova/compute/flavors.py:101
+#, python-format
+msgid "'%s' argument must be a positive integer"
+msgstr ""
+
+#: nova/compute/flavors.py:110
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
+
+#: nova/compute/flavors.py:119
+msgid "'rxtx_factor' argument must be a positive float"
+msgstr ""
+
+#: nova/compute/flavors.py:132
+msgid "is_public must be a boolean"
+msgstr ""
+
+#: nova/compute/flavors.py:137
+#, python-format
+msgid "DB error: %s"
+msgstr ""
+
+#: nova/compute/flavors.py:147
+#, python-format
+msgid "Instance type %s not found for deletion"
+msgstr ""
+
+#: nova/compute/manager.py:210
+msgid "Possibly task preempted."
+msgstr ""
+
+#: nova/compute/manager.py:383
+#, python-format
+msgid "%s is not a valid node managed by this compute host."
+msgstr ""
+
+#: nova/compute/manager.py:411
+msgid "Instance has been destroyed from under us while trying to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:460
+#, python-format
+msgid ""
+"Deleting instance as its host (%(instance_host)s) is not equal to our "
+"host (%(our_host)s)."
+msgstr ""
+
+#: nova/compute/manager.py:476
+msgid "Instance has been marked deleted already, removing it from the hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:497
+msgid ""
+"Hypervisor driver does not support instance shared storage check, "
+"assuming it's not on shared storage"
+msgstr ""
+
+#: nova/compute/manager.py:503
+msgid "Failed to check if instance shared"
+msgstr ""
+
+#: nova/compute/manager.py:545
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:571
+msgid "Failed to revert crashed migration"
+msgstr ""
+
+#: nova/compute/manager.py:574
+msgid "Instance found in migrating state during startup. Resetting task_state"
+msgstr ""
+
+#: nova/compute/manager.py:585
+#, python-format
+msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
+msgstr ""
+
+#: nova/compute/manager.py:591
+msgid "Rebooting instance after nova-compute restart."
+msgstr ""
+
+#: nova/compute/manager.py:605
+msgid "Hypervisor driver does not support resume guests"
+msgstr ""
+
+#: nova/compute/manager.py:610
+msgid "Failed to resume instance"
+msgstr ""
+
+#: nova/compute/manager.py:620
+msgid "Hypervisor driver does not support firewall rules"
+msgstr ""
+
+#: nova/compute/manager.py:624
+#, python-format
+msgid "Lifecycle event %(state)d on VM %(uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:640
+#, python-format
+msgid "Unexpected power state %d"
+msgstr ""
+
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
+#, python-format
+msgid "Ignoring event %s"
+msgstr ""
+
+#: nova/compute/manager.py:694
+msgid "Checking state"
+msgstr ""
+
+#: nova/compute/manager.py:792
+#, python-format
+msgid "Volume id: %s finished being created but was not set as 'available'"
+msgstr ""
+
+#: nova/compute/manager.py:809
+#, python-format
+msgid "Setting up bdm %s"
+msgstr ""
+
+#: nova/compute/manager.py:910
+msgid "Success"
+msgstr ""
+
+#: nova/compute/manager.py:933
+msgid "Instance disappeared before we could start it"
+msgstr ""
+
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
+#, python-format
+msgid "No node specified, defaulting to %s"
+msgstr ""
+
+#: nova/compute/manager.py:1004
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:1013
+msgid "Instance was deleted during spawn."
+msgstr ""
+
+#: nova/compute/manager.py:1044
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1061
+msgid "Clean up resource before rescheduling."
+msgstr ""
+
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
+msgid "Error trying to reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1099
+msgid "Retry info not present, will not reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1104
+msgid "No request spec, will not reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1110
+#, python-format
+msgid "Re-scheduling %(method)s: attempt %(num)d"
+msgstr ""
+
+#: nova/compute/manager.py:1139
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:1149
+msgid "Starting instance..."
+msgstr ""
+
+#: nova/compute/manager.py:1163
+msgid "Allocating IP information in the background."
+msgstr ""
+
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
+msgstr ""
+
+#: nova/compute/manager.py:1180
+#, python-format
+msgid "Instance network_info: |%s|"
+msgstr ""
+
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
+msgid "Instance failed block device setup"
+msgstr ""
+
+#: nova/compute/manager.py:1244
+msgid "Instance failed to spawn"
+msgstr ""
+
+#: nova/compute/manager.py:1295
+msgid "Deallocating network for instance"
+msgstr ""
+
+#: nova/compute/manager.py:1369
+msgid "Failed to deallocate network for instance."
+msgstr ""
+
+#: nova/compute/manager.py:1376
+#, python-format
+msgid "%(action_str)s instance"
+msgstr ""
+
+#: nova/compute/manager.py:1419
+#, python-format
+msgid "Ignoring DiskNotFound: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1422
+#, python-format
+msgid "Ignoring VolumeNotFound: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1429
+#, python-format
+msgid "terminating bdm %s"
+msgstr ""
+
+#: nova/compute/manager.py:1477
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:1703
+msgid "Rebuilding instance"
+msgstr ""
+
+#: nova/compute/manager.py:1716
+msgid "Invalid state of instance files on shared storage"
+msgstr ""
+
+#: nova/compute/manager.py:1720
+msgid "disk on shared storage, recreating using existing disk"
+msgstr ""
+
+#: nova/compute/manager.py:1724
+#, python-format
+msgid "disk not on shared storagerebuilding from: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:1807
+#, python-format
+msgid "bringing vm to original state: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:1839
+#, python-format
+msgid "Detaching from volume api: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1857
+msgid "Rebooting instance"
+msgstr ""
+
+#: nova/compute/manager.py:1876
+#, python-format
+msgid ""
+"trying to reboot a non-running instance: (state: %(state)s expected: "
+"%(running)s)"
+msgstr ""
+
+#: nova/compute/manager.py:1912
+msgid "Reboot failed but instance is running"
+msgstr ""
+
+#: nova/compute/manager.py:1915
+#, python-format
+msgid "Cannot reboot instance: %(error)s"
+msgstr ""
+
+#: nova/compute/manager.py:1928
+msgid "Instance disappeared during reboot"
+msgstr ""
+
+#: nova/compute/manager.py:1955
+msgid "instance snapshotting"
+msgstr ""
+
+#: nova/compute/manager.py:1961
+#, python-format
+msgid ""
+"trying to snapshot a non-running instance: (state: %(state)s expected: "
+"%(running)s)"
+msgstr ""
+
+#: nova/compute/manager.py:2022
+#, python-format
+msgid "Found %(num_images)d images (rotation: %(rotation)d)"
+msgstr ""
+
+#: nova/compute/manager.py:2030
+#, python-format
+msgid "Rotating out %d backups"
+msgstr ""
+
+#: nova/compute/manager.py:2035
+#, python-format
+msgid "Deleting image %s"
+msgstr ""
+
+#: nova/compute/manager.py:2063
+#, python-format
+msgid "Failed to set admin password. Instance %s is not running"
+msgstr ""
+
+#: nova/compute/manager.py:2070
+msgid "Root password set"
+msgstr ""
+
+#: nova/compute/manager.py:2077
+msgid "set_admin_password is not implemented by this driver or guest instance."
+msgstr ""
+
+#: nova/compute/manager.py:2092
+#, python-format
+msgid "set_admin_password failed: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2099
+msgid "error setting admin password"
+msgstr ""
+
+#: nova/compute/manager.py:2112
+#, python-format
+msgid ""
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
+msgstr ""
+
+#: nova/compute/manager.py:2117
+#, python-format
+msgid "injecting file to %s"
+msgstr ""
+
+#: nova/compute/manager.py:2137
+msgid ""
+"Unable to find a different image to use for rescue VM, using instance's "
+"current image"
+msgstr ""
+
+#: nova/compute/manager.py:2150
+msgid "Rescuing"
+msgstr ""
+
+#: nova/compute/manager.py:2169
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2173
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2191
+msgid "Unrescuing"
+msgstr ""
+
+#: nova/compute/manager.py:2212
+#, python-format
+msgid "Changing instance metadata according to %r"
+msgstr ""
+
+#: nova/compute/manager.py:2434
+#, python-format
+msgid "Updating instance to original state: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:2468
+msgid "Instance has no source host"
+msgstr ""
+
+#: nova/compute/manager.py:2474
+msgid "destination same as source!"
+msgstr ""
+
+#: nova/compute/manager.py:2495
+msgid "Migrating"
+msgstr ""
+
+#: nova/compute/manager.py:2746
+#, python-format
+msgid "Failed to rollback quota for failed finish_resize: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2809
+msgid "Pausing"
+msgstr ""
+
+#: nova/compute/manager.py:2827
+msgid "Unpausing"
+msgstr ""
+
+#: nova/compute/manager.py:2866
+msgid "Retrieving diagnostics"
+msgstr ""
+
+#: nova/compute/manager.py:2897
+msgid "Resuming"
+msgstr ""
+
+#: nova/compute/manager.py:2917
+msgid "Reset network"
+msgstr ""
+
+#: nova/compute/manager.py:2922
+msgid "Inject network info"
+msgstr ""
+
+#: nova/compute/manager.py:2925
+#, python-format
+msgid "network_info to inject: |%s|"
+msgstr ""
+
+#: nova/compute/manager.py:2942
+msgid "Get console output"
+msgstr ""
+
+#: nova/compute/manager.py:2969
+msgid "Getting vnc console"
+msgstr ""
+
+#: nova/compute/manager.py:3004
+msgid "Getting spice console"
+msgstr ""
+
+#: nova/compute/manager.py:3052
+#, python-format
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3103
+#, python-format
+msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3113
+#, python-format
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3129
+#, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3160
+#, python-format
+msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
+msgstr ""
+
+#: nova/compute/manager.py:3171
+msgid "Detaching volume from unknown instance"
+msgstr ""
+
+#: nova/compute/manager.py:3178
+#, python-format
+msgid "Failed to detach volume %(volume_id)s from %(mp)s"
+msgstr ""
+
+#: nova/compute/manager.py:3202
+msgid "Updating volume usage cache with totals"
+msgstr ""
+
+#: nova/compute/manager.py:3238
+#, python-format
+msgid "allocate_port_for_instance returned %(ports)s ports"
+msgstr ""
+
+#: nova/compute/manager.py:3258
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
+
+#: nova/compute/manager.py:3272
+#, python-format
+msgid "Host %s not found"
+msgstr ""
+
+#: nova/compute/manager.py:3425
+#, python-format
+msgid "Pre live migration failed at %s"
+msgstr ""
+
+#: nova/compute/manager.py:3453
+msgid "_post_live_migration() is started.."
+msgstr ""
+
+#: nova/compute/manager.py:3508
+#, python-format
+msgid "Migrating instance to %s finished successfully."
+msgstr ""
+
+#: nova/compute/manager.py:3510
+msgid ""
+"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
+"with matching name.\" This error can be safely ignored."
+msgstr ""
+
+#: nova/compute/manager.py:3525
+msgid "Post operation of migration started"
+msgstr ""
+
+#: nova/compute/manager.py:3557
+#, python-format
+msgid "Failed to get compute_info for %s"
+msgstr ""
+
+#: nova/compute/manager.py:3686
+msgid "Updated the info_cache for instance"
+msgstr ""
+
+#: nova/compute/manager.py:3738
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:3743
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:3752
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:3760
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
+
+#: nova/compute/manager.py:3765
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:3772
+#, python-format
+msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
+msgstr ""
+
+#: nova/compute/manager.py:3783
+#, python-format
+msgid "Error auto-confirming resize: %s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:3799
+#, python-format
+msgid ""
+"Running instance usage audit for host %(host)s from %(begin_time)s to "
+"%(end_time)s. %(number_instances)s instances."
+msgstr ""
+
+#: nova/compute/manager.py:3819
+#, python-format
+msgid "Failed to generate usage audit for instance on host %s"
+msgstr ""
+
+#: nova/compute/manager.py:3843
+msgid "Updating bandwidth usage cache"
+msgstr ""
+
+#: nova/compute/manager.py:3946
+msgid "Updating volume usage cache"
+msgstr ""
+
+#: nova/compute/manager.py:3960
+msgid "Updating host status"
+msgstr ""
+
+#: nova/compute/manager.py:3987
+#, python-format
+msgid ""
+"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
+"the hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
+msgid "During sync_power_state the instance has a pending task. Skip."
+msgstr ""
+
+#: nova/compute/manager.py:4030
+#, python-format
+msgid ""
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:4067
+msgid "Instance shutdown by itself. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
+msgid "error during stop() in sync_power_state."
+msgstr ""
+
+#: nova/compute/manager.py:4083
+msgid "Instance is suspended unexpectedly. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:4099
+msgid "Instance is paused unexpectedly. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:4105
+msgid "Instance is unexpectedly not found. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:4111
+msgid "Instance is not stopped. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:4127
+msgid "Instance is not (soft-)deleted."
+msgstr ""
+
+#: nova/compute/manager.py:4135
+msgid "CONF.reclaim_instance_interval <= 0, skipping..."
+msgstr ""
+
+#: nova/compute/manager.py:4148
+msgid "Reclaiming deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:4175
+#, python-format
+msgid "Deleting orphan compute node %s"
+msgstr ""
+
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
+#, python-format
+msgid "No service record for host %s"
+msgstr ""
+
+#: nova/compute/manager.py:4225
+#, python-format
+msgid ""
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
+msgstr ""
+
+#: nova/compute/manager.py:4231
+#, python-format
+msgid ""
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
+msgstr ""
+
+#: nova/compute/manager.py:4238
+#, python-format
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
+msgstr ""
+
+#: nova/compute/manager.py:4265
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:92
+msgid ""
+"Host field should not be set on the instance until resources have been "
+"claimed."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:97
+msgid ""
+"Node field should be not be set on the instance until resources have been"
+" claimed."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:244
+msgid "Auditing locally available compute resources"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:249
+msgid ""
+"Virt driver does not support 'get_available_resource'  Compute tracking "
+"is disabled."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:301
+#, python-format
+msgid "Compute_service record created for %(host)s:%(node)s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:307
+#, python-format
+msgid "Compute_service record updated for %(host)s:%(node)s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:331
+#, python-format
+msgid "Hypervisor: free ram (MB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:332
+#, python-format
+msgid "Hypervisor: free disk (GB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:337
+#, python-format
+msgid "Hypervisor: free VCPUs: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:339
+msgid "Hypervisor: VCPU information unavailable"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:346
+#, python-format
+msgid "Free ram (MB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:347
+#, python-format
+msgid "Free disk (GB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:352
+#, python-format
+msgid "Free VCPUS: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:354
+msgid "Free VCPU information unavailable"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:383
+#, python-format
+msgid "Updating from migration %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:443
+msgid "Instance not resizing, skipping migration."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:458
+msgid "InstanceType could not be found, skipping migration."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:542
+#, python-format
+msgid ""
+"Detected running orphan instance: %(uuid)s (consuming %(memory_mb)s MB "
+"memory"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:555
+#, python-format
+msgid "Missing keys: %s"
+msgstr ""
+
+#: nova/compute/rpcapi.py:58
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/rpcapi.py:61
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/utils.py:141
+#, python-format
+msgid "Using %(prefix)s instead of %(req_prefix)s"
+msgstr ""
+
+#: nova/conductor/api.py:399
+msgid ""
+"Timed out waiting for nova-conductor. Is it running? Or did this service "
+"start before nova-conductor?"
+msgstr ""
+
+#: nova/conductor/manager.py:116
+#, python-format
+msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
+msgstr ""
+
+#: nova/conductor/manager.py:322
+msgid "Invalid block_device_mapping_destroy invocation"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
+#: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
+msgid "Adding console"
+msgstr ""
+
+#: nova/console/manager.py:101 nova/console/vmrc_manager.py:113
+#, python-format
+msgid "Tried to remove non-existent console %(console_id)s."
+msgstr ""
+
+#: nova/console/vmrc_manager.py:116
+#, python-format
+msgid "Removing console %(console_id)s."
+msgstr ""
+
+#: nova/console/websocketproxy.py:54
+msgid "Invalid Token"
+msgstr ""
+
+#: nova/console/websocketproxy.py:73
+msgid "Invalid Connection Info"
+msgstr ""
+
+#: nova/console/xvp.py:100
+msgid "Rebuilding xvp conf"
+msgstr ""
+
+#: nova/console/xvp.py:119
+#, python-format
+msgid "Re-wrote %s"
+msgstr ""
+
+#: nova/console/xvp.py:124
+msgid "Failed to write configuration file"
+msgstr ""
+
+#: nova/console/xvp.py:127
+msgid "Stopping xvp"
+msgstr ""
+
+#: nova/console/xvp.py:140
+msgid "Starting xvp"
+msgstr ""
+
+#: nova/console/xvp.py:147
+#, python-format
+msgid "Error starting xvp: %s"
+msgstr ""
+
+#: nova/console/xvp.py:150
+msgid "Restarting xvp"
+msgstr ""
+
+#: nova/console/xvp.py:152
+msgid "xvp not running..."
+msgstr ""
+
+#: nova/console/xvp.py:203
+msgid "Failed to run xvp."
+msgstr ""
+
+#: nova/consoleauth/manager.py:89
+#, python-format
+msgid "Received Token: %(token)s, %(token_dict)s)"
+msgstr ""
+
+#: nova/consoleauth/manager.py:113
+#, python-format
+msgid "Checking Token: %(token)s, %(token_valid)s)"
+msgstr ""
+
+#: nova/db/api.py:592
+msgid "Failed to notify cells of instance destroy"
+msgstr ""
+
+#: nova/db/api.py:674 nova/db/api.py:695
+msgid "Failed to notify cells of instance update"
+msgstr ""
+
+#: nova/db/api.py:1551
+msgid "Failed to notify cells of bw_usage update"
+msgstr ""
+
+#: nova/db/api.py:1690
+msgid "Failed to notify cells of instance fault"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:160
+#, python-format
+msgid "Deadlock detected when running '%(func_name)s': Retrying..."
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:195
+msgid "model or base_model parameter should be subclass of NovaBase"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:649
+#, python-format
+msgid "Invalid floating ip id %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:870
+#, python-format
+msgid "Invalid floating IP %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
+#, python-format
+msgid "Invalid fixed IP Address %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1332
+#, python-format
+msgid "Invalid virtual interface address %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1425
+#, python-format
+msgid ""
+"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
+"empty, \"global\" or \"project\""
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1560
+#, python-format
+msgid "Invalid instance id %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:2915
+#, python-format
+msgid "Change will make usage less than 0 for the following resources: %(unders)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:4451
+#, python-format
+msgid ""
+"Volume(%s) has lower stats then what is in the database. Instance must "
+"have been rebooted or crashed. Updating totals."
+msgstr ""
+
+#: nova/db/sqlalchemy/migration.py:69
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:66
+msgid "version should be an integer"
+msgstr ""
+
+#: nova/db/sqlalchemy/migration.py:96
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:94
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:77
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:83
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:210
+#, python-format
+msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:244
+#, python-format
+msgid "Missing column %(table)s.%(column)s in shadow table"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:250
+#, python-format
+msgid ""
+"Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
+"%(shadow_c_type)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:259
+#, python-format
+msgid "Extra column %(table)%.%(column)s in shadow table"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:279
+msgid "Specify `table_name` or `table` param"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:282
+msgid "Specify only one param `table_name` `table`"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
+msgid "Exception while creating table."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:316
+msgid "Unsupported id columns type"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:62
+msgid "Exception while seeding instance_types table"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/145_add_volume_usage_cache.py:68
+msgid "volume_usage_cache table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:77
+#, python-format
+msgid "table '%s' not dropped"
+msgstr ""
+
+#: nova/image/glance.py:187
+#, python-format
+msgid ""
+"Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
+"%(extra)s."
+msgstr ""
+
+#: nova/image/glance.py:496
+#, python-format
+msgid "fetching image %s from glance"
+msgstr ""
+
+#: nova/image/s3.py:332
+#, python-format
+msgid "Failed to download %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:349
+#, python-format
+msgid "Failed to decrypt %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:360
+#, python-format
+msgid "Failed to untar %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:370
+#, python-format
+msgid "Failed to upload %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:382
+#, python-format
+msgid "Image %s was deleted underneath us"
+msgstr ""
+
+#: nova/image/s3.py:397
+#, python-format
+msgid "Failed to decrypt private key: %s"
+msgstr ""
+
+#: nova/image/s3.py:404
+#, python-format
+msgid "Failed to decrypt initialization vector: %s"
+msgstr ""
+
+#: nova/image/s3.py:415
+#, python-format
+msgid "Failed to decrypt image file %(image_file)s: %(err)s"
+msgstr ""
+
+#: nova/image/s3.py:427
+msgid "Unsafe filenames in image"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:38 nova/ipv6/rfc2462.py:34
+#, python-format
+msgid "Bad mac for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36
+#, python-format
+msgid "Bad prefix for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:42
+#, python-format
+msgid "Bad project_id for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/network/api.py:56
+msgid "instance is a required argument to use @refresh_cache"
+msgstr ""
+
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
+msgid "Failed storing info cache"
+msgstr ""
+
+#: nova/network/api.py:248
+#, python-format
+msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
+msgstr ""
+
+#: nova/network/driver.py:40
+msgid "Network driver option required, but not specified"
+msgstr ""
+
+#: nova/network/driver.py:43
+#, python-format
+msgid "Loading network driver '%s'"
+msgstr ""
+
+#: nova/network/floating_ips.py:88
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/floating_ips.py:98 nova/network/floating_ips.py:374
+#, python-format
+msgid "Interface %(interface)s not found"
+msgstr ""
+
+#: nova/network/floating_ips.py:122
+#, python-format
+msgid "floating IP allocation for instance |%(floating_address)s|"
+msgstr ""
+
+#: nova/network/floating_ips.py:179
+msgid "Floating IP is not associated. Ignore."
+msgstr ""
+
+#: nova/network/floating_ips.py:197
+#, python-format
+msgid "Address |%(address)s| is not allocated"
+msgstr ""
+
+#: nova/network/floating_ips.py:201
+#, python-format
+msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
+msgstr ""
+
+#: nova/network/floating_ips.py:221
+#, python-format
+msgid "Quota exceeded for %(pid)s, tried to allocate floating IP"
+msgstr ""
+
+#: nova/network/floating_ips.py:282
+msgid "Failed to update usages deallocating floating IP"
+msgstr ""
+
+#: nova/network/floating_ips.py:532
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/floating_ips.py:539
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/floating_ips.py:574
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/floating_ips.py:582
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/floating_ips.py:630
+#, python-format
+msgid ""
+"Database inconsistency: DNS domain |%s| is registered in the Nova db but "
+"not visible to either the floating or instance DNS driver. It will be "
+"ignored."
+msgstr ""
+
+#: nova/network/floating_ips.py:670
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
+msgstr ""
+
+#: nova/network/floating_ips.py:679
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
+msgstr ""
+
+#: nova/network/ldapdns.py:102
+#, python-format
+msgid ""
+"Found multiple matches for domain %(domain)s.\n"
+"%(entry)s"
+msgstr ""
+
+#: nova/network/ldapdns.py:129
+#, python-format
+msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
+msgstr ""
+
+#: nova/network/ldapdns.py:325
+msgid "This driver only supports type 'a' entries."
+msgstr ""
+
+#: nova/network/ldapdns.py:368
+msgid "This shouldn't be getting called except during testing."
+msgstr ""
+
+#: nova/network/linux_net.py:219
+#, python-format
+msgid "Attempted to remove chain %s which does not exist"
+msgstr ""
+
+#: nova/network/linux_net.py:254
+#, python-format
+msgid "Unknown chain: %r"
+msgstr ""
+
+#: nova/network/linux_net.py:279
+#, python-format
+msgid ""
+"Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
+"%(top)r"
+msgstr ""
+
+#: nova/network/linux_net.py:424
+msgid "IPTablesManager.apply completed with success"
+msgstr ""
+
+#: nova/network/linux_net.py:681
+#, python-format
+msgid "arping error for ip %s"
+msgstr ""
+
+#: nova/network/linux_net.py:731
+#, python-format
+msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
+msgstr ""
+
+#: nova/network/linux_net.py:779
+#, python-format
+msgid "Error deleting conntrack entries for %s"
+msgstr ""
+
+#: nova/network/linux_net.py:980
+#, python-format
+msgid "Pid %d is stale, skip killing dnsmasq"
+msgstr ""
+
+#: nova/network/linux_net.py:1025
+#, python-format
+msgid "Hupping dnsmasq threw %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1027
+#, python-format
+msgid "Pid %d is stale, relaunching dnsmasq"
+msgstr ""
+
+#: nova/network/linux_net.py:1107
+#, python-format
+msgid "killing radvd threw %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1109
+#, python-format
+msgid "Pid %d is stale, relaunching radvd"
+msgstr ""
+
+#: nova/network/linux_net.py:1297
+#, python-format
+msgid "Net device removed: '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1300
+#, python-format
+msgid "Failed removing net device: '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1418
+#, python-format
+msgid "Starting VLAN interface %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1464
+#, python-format
+msgid "Starting Bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1476
+#, python-format
+msgid "Adding interface %(interface)s to bridge %(bridge)s"
+msgstr ""
+
+#: nova/network/linux_net.py:1512
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1749
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1757
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/manager.py:365
+#, python-format
+msgid "Disassociated %s stale fixed ip(s)"
+msgstr ""
+
+#: nova/network/manager.py:369
+msgid "setting network host"
+msgstr ""
+
+#: nova/network/manager.py:481
+msgid "network allocations"
+msgstr ""
+
+#: nova/network/manager.py:488
+#, python-format
+msgid "networks retrieved for instance: |%(networks_list)s|"
+msgstr ""
+
+#: nova/network/manager.py:536
+msgid "network deallocation for instance"
+msgstr ""
+
+#: nova/network/manager.py:803
+#, python-format
+msgid ""
+"instance-dns-zone is |%(domain)s|, which is in availability zone "
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
+msgstr ""
+
+#: nova/network/manager.py:829
+#, python-format
+msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
+msgstr ""
+
+#: nova/network/manager.py:881
+msgid "Failed to update usages deallocating fixed IP"
+msgstr ""
+
+#: nova/network/manager.py:913
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:936
+#, python-format
+msgid "Leased IP |%(address)s|"
+msgstr ""
+
+#: nova/network/manager.py:940
+#, python-format
+msgid "IP %s leased that is not associated"
+msgstr ""
+
+#: nova/network/manager.py:949
+#, python-format
+msgid "IP |%s| leased that isn't allocated"
+msgstr ""
+
+#: nova/network/manager.py:954
+#, python-format
+msgid "Released IP |%(address)s|"
+msgstr ""
+
+#: nova/network/manager.py:958
+#, python-format
+msgid "IP %s released that is not associated"
+msgstr ""
+
+#: nova/network/manager.py:962
+#, python-format
+msgid "IP %s released that was not leased"
+msgstr ""
+
+#: nova/network/manager.py:981
+#, python-format
+msgid "%s must be an integer"
+msgstr ""
+
+#: nova/network/manager.py:1005
+msgid "Maximum allowed length for 'label' is 255."
+msgstr ""
+
+#: nova/network/manager.py:1025
+#, python-format
+msgid ""
+"Subnet(s) too large, defaulting to /%s.  To override, specify "
+"network_size flag."
+msgstr ""
+
+#: nova/network/manager.py:1107
+msgid "cidr already in use"
+msgstr ""
+
+#: nova/network/manager.py:1110
+#, python-format
+msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
+msgstr ""
+
+#: nova/network/manager.py:1121
+#, python-format
+msgid ""
+"requested cidr (%(cidr)s) conflicts with existing smaller cidr "
+"(%(smaller)s)"
+msgstr ""
+
+#: nova/network/manager.py:1178
+msgid "Network already exists!"
+msgstr ""
+
+#: nova/network/manager.py:1197
+#, python-format
+msgid "Network must be disassociated from project %s before delete"
+msgstr ""
+
+#: nova/network/manager.py:1792
+msgid ""
+"The sum between the number of networks and the vlan start cannot be "
+"greater than 4094"
+msgstr ""
+
+#: nova/network/manager.py:1799
+#, python-format
+msgid ""
+"The network range is not big enough to fit %(num_networks)s networks. "
+"Network size is %(network_size)s"
+msgstr ""
+
+#: nova/network/minidns.py:48
+#, python-format
+msgid "minidns file is |%s|"
+msgstr ""
+
+#: nova/network/minidns.py:75 nova/network/minidns.py:106
+msgid "Invalid name"
+msgstr ""
+
+#: nova/network/minidns.py:78
+msgid "This driver only supports type 'a'"
+msgstr ""
+
+#: nova/network/minidns.py:122
+#, python-format
+msgid "Cannot delete entry |%s|"
+msgstr ""
+
+#: nova/network/minidns.py:201
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: nova/network/minidns.py:207
+#, python-format
+msgid "Cannot delete domain |%s|"
+msgstr ""
+
+#: nova/network/model.py:383
+msgid "v4 subnets are required for legacy nw_info"
+msgstr ""
+
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:152
+#, python-format
+msgid "allocate_for_instance() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:155
+#, python-format
+msgid "empty project id for instance %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:201
+#, python-format
+msgid ""
+"Multiple security groups found matching '%s'. Use an ID to be more "
+"specific."
+msgstr ""
+
+#: nova/network/quantumv2/api.py:270
+msgid "Port not found"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:278
+#, python-format
+msgid "Fail to delete port %(portid)s with failure: %(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:318
+#, python-format
+msgid "deallocate_for_instance() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:327
+#, python-format
+msgid "Failed to delete quantum port %(portid)s "
+msgstr ""
+
+#: nova/network/quantumv2/api.py:349
+#, python-format
+msgid "Failed to delete quantum port %(port_id)s "
+msgstr ""
+
+#: nova/network/quantumv2/api.py:373
+#, python-format
+msgid "get_instance_nw_info() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:405
+#, python-format
+msgid ""
+"Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
+"%(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:435
+#, python-format
+msgid "Unable to update port %(portid)s with failure: %(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:445
+#, python-format
+msgid "validate_networks() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:688
+#, python-format
+msgid "Multiple floating IP pools matches found for name '%s'"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:56
+#, python-format
+msgid "Quantum Error creating security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:75
+#, python-format
+msgid "Quantum Error updating security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:129
+#, python-format
+msgid "Quantum security group %s not found"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
+#, python-format
+msgid "Quantum Error: %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:153
+msgid "Quantum Error getting security groups"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:162
+msgid "Security group id should be uuid"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:199
+#, python-format
+msgid "Quantum Error getting security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
+msgid "Quantum Error:"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:257
+#, python-format
+msgid "Quantum Error unable to delete %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:267
+#, python-format
+msgid "Quantum security group rule %s not found"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:382
+#, python-format
+msgid ""
+"Cannot add security group %(name)s to %(instance)s since the port "
+"%(port_id)s does not meet security requirements"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
+#, python-format
+msgid "Adding security group %(security_group_id)s to port %(port_id)s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:453
+#, python-format
+msgid ""
+"Security group %(security_group_name)s not assocaited with the instance "
+"%(instance)s"
+msgstr ""
+
+#: nova/network/security_group/security_group_base.py:137
+#, python-format
+msgid "This rule already exists in group %s"
+msgstr ""
+
+#: nova/objects/base.py:54
+#, python-format
+msgid "Error setting %(attr)s"
+msgstr ""
+
+#: nova/objects/base.py:145
+msgid "Invalid version string"
+msgstr ""
+
+#: nova/objects/base.py:202
+#, python-format
+msgid "Unable to instantiate unregistered object type %(objtype)s"
+msgstr ""
+
+#: nova/objects/base.py:305
+#, python-format
+msgid "Cannot load '%(attrname)s' in the base class"
+msgstr ""
+
+#: nova/openstack/common/excutils.py:48
+#, python-format
+msgid "Original exception being dropped: %s"
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:102
+#, python-format
+msgid "Could not release the acquired lock `%s`"
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:188
+#, python-format
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:199
+#, python-format
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:226
+#, python-format
+msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:234
+#, python-format
+msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/log.py:244
+#, python-format
+msgid "Deprecated: %s"
+msgstr ""
+
+#: nova/openstack/common/log.py:336
+#, python-format
+msgid "Error loading logging config %(log_config)s: %(err_msg)s"
+msgstr ""
+
+#: nova/openstack/common/log.py:386
+#, python-format
+msgid "syslog facility must be one of: %s"
+msgstr ""
+
+#: nova/openstack/common/log.py:555
+#, python-format
+msgid "Fatal call to deprecated config: %(msg)s"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:84
+#, python-format
+msgid "task run outlasted interval by %s sec"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:91
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:131
+#, python-format
+msgid "Dynamic looping call sleeping for %.02f seconds"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:41
+#, python-format
+msgid "Unexpected argument for periodic task creation: %(arg)s."
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:132
+#, python-format
+msgid "Skipping periodic task %(task)s because its interval is negative"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:137
+#, python-format
+msgid "Skipping periodic task %(task)s because it is disabled"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:175
+#, python-format
+msgid "Running periodic task %(full_task_name)s"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:183
+#, python-format
+msgid "Error during %(full_task_name)s: %(e)s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:394
+#, python-format
+msgid "Failed to understand rule %(rule)s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:86
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:462
+msgid "DB exception wrapped."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:513
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:585
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:125
+#, python-format
+msgid "%s not in valid priorities"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:141
+#, python-format
+msgid ""
+"Problem '%(e)s' attempting to send to notification system. "
+"Payload=%(payload)s"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:171
+#, python-format
+msgid "Failed to load notifier %s. These notifications will not be sent."
+msgstr ""
+
+#: nova/openstack/common/notifier/rabbit_notifier.py:27
+msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
+msgstr ""
+
+#: nova/openstack/common/notifier/rpc_notifier.py:45
+#: nova/openstack/common/notifier/rpc_notifier2.py:51
+#, python-format
+msgid "Could not send notification to %(topic)s. Payload=%(message)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/__init__.py:106
+#, python-format
+msgid ""
+"A RPC is being made while holding a lock. The locks currently held are "
+"%(locks)s. This is probably a bug. Please report it. Include the "
+"following: [%(stack)s]."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:75
+msgid "Pool creating new connection"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:200
+#, python-format
+msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:208
+#, python-format
+msgid ""
+"Number of call waiters is greater than warning threshhold: %d. There "
+"could be a MulticallProxyWaiter leak."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:291
+#, python-format
+msgid "unpacked context: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:337
+#, python-format
+msgid "UNIQUE_ID is %s."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:406
+#, python-format
+msgid "received %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:414
+#, python-format
+msgid "no method for message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:415
+#, python-format
+msgid "No method for message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
+#, python-format
+msgid "Expected exception during message handling (%s)"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
+msgid "Exception during message handling"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:586
+#, python-format
+msgid "Making synchronous call on %s ..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:589
+#, python-format
+msgid "MSG_ID is %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:623
+#, python-format
+msgid "Making asynchronous cast on %s..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:632
+msgid "Making asynchronous fanout cast..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:660
+#, python-format
+msgid "Sending %(event_type)s on %(topic)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:75
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:105
+#, python-format
+msgid ""
+"Remote error: %(exc_type)s %(value)s\n"
+"%(traceback)s."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:122
+#, python-format
+msgid ""
+"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
+" \"%(method)s\" info: \"%(info)s\""
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:138
+#: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
+msgid "<unknown>"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:144
+#, python-format
+msgid "Found duplicate message(%(msg_id)s). Skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:148
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:152
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:157
+#, python-format
+msgid ""
+"Specified RPC envelope version, %(version)s, not supported by this "
+"endpoint."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
+#, python-format
+msgid "Failed to sanitize %(item)s. Key error %(err)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:307
+#, python-format
+msgid "Returning exception %s to caller"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:169
+#: nova/openstack/common/rpc/impl_qpid.py:153
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:480
+#, python-format
+msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:502
+#, python-format
+msgid "Connected to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:539
+#, python-format
+msgid ""
+"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
+"%(max_retries)d tries: %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:555
+#, python-format
+msgid ""
+"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
+"again in %(sleep_time)d seconds."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:609
+#: nova/openstack/common/rpc/impl_qpid.py:457
+#, python-format
+msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:627
+#: nova/openstack/common/rpc/impl_qpid.py:472
+#, python-format
+msgid "Timed out waiting for RPC response: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:631
+#: nova/openstack/common/rpc/impl_qpid.py:476
+#, python-format
+msgid "Failed to consume message from queue: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:670
+#: nova/openstack/common/rpc/impl_qpid.py:511
+#, python-format
+msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:399
+#, python-format
+msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:405
+#, python-format
+msgid "Connected to AMQP server on %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:418
+msgid "Re-established AMQP queues"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:484
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:97
+msgid "JSON serialization failed."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:104
+#, python-format
+msgid "Deserializing: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:140
+#, python-format
+msgid "Connecting to %(addr)s with %(type)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:141
+#, python-format
+msgid "-> Subscribed to %(subscribe)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:142
+#, python-format
+msgid "-> bind: %(bind)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:150
+msgid "Could not open socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:162
+#, python-format
+msgid "Subscribing to %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:204
+msgid "You cannot recv on this socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:209
+msgid "You cannot send on this socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:273
+#, python-format
+msgid "Running func with context: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:311
+msgid "Sending reply"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:345
+msgid "RPC message did not include method."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:380
+msgid "Registering reactor"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:392
+msgid "In reactor registered"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:407
+msgid "Out reactor registered"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:411
+msgid "Consuming socket"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:453
+#, python-format
+msgid "CONSUMER GOT %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:465
+#, python-format
+msgid "Creating proxy for topic: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:471
+msgid "Topic contained dangerous characters."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:496
+#, python-format
+msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:505
+msgid "Topic socket file creation failed."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:510
+#, python-format
+msgid "ROUTER RELAY-OUT QUEUED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:513
+#, python-format
+msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:532
+#, python-format
+msgid "Could not create IPC directory %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:542
+msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:576
+#, python-format
+msgid "CONSUMER RECEIVED DATA: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:578
+#, python-format
+msgid "ROUTER RELAY-OUT %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:600
+msgid "ZMQ Envelope version unsupported or unknown."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:628
+msgid "Skipping topic registration. Already registered."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:635
+#, python-format
+msgid "Consumer is a zmq.%s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:687
+msgid "Creating payload"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:700
+msgid "Creating queue socket for reply waiter"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:713
+msgid "Sending cast"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:716
+msgid "Cast sent; Waiting reply"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:719
+#, python-format
+msgid "Received message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:720
+msgid "Unpacking response"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:729
+msgid "Unsupported or unknown ZMQ envelope returned."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:736
+msgid "RPC Message Invalid."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:760
+#, python-format
+msgid "%(msg)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:763
+#, python-format
+msgid "Sending message(s) to: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:767
+msgid "No matchmaker results. Not casting."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:770
+msgid "No match from matchmaker."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:53
+msgid "Match not found by MatchMaker."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:89
+msgid "Matchmaker does not implement registration or heartbeat."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:239
+#, python-format
+msgid "Matchmaker unregistered: %s, %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:250
+msgid "Register before starting heartbeat."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:343
+#: nova/openstack/common/rpc/matchmaker.py:361
+#, python-format
+msgid "No key defining hosts for topic '%s', see ringfile"
+msgstr ""
+
+#: nova/scheduler/chance.py:56
+msgid "Is the appropriate service running?"
+msgstr ""
+
+#: nova/scheduler/chance.py:61
+msgid "Could not find another compute"
+msgstr ""
+
+#: nova/scheduler/driver.py:57
+msgid "Exception during scheduler.run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
+
+#: nova/scheduler/driver.py:150
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:158
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:163
+msgid "Driver must implement select_hosts"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:76
+#, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:80
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:100
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:242
+msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:259
+#, python-format
+msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:291
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:359
+#, python-format
+msgid "Filtered %(hosts)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:364
+#, python-format
+msgid "Weighed %(hosts)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:417
+#, python-format
+msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:308
+#, python-format
+msgid "Host filter ignoring hosts: %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:320
+#, python-format
+msgid "Host filter forcing available hosts to %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:323
+#, python-format
+msgid "No hosts matched due to not matching 'force_hosts' value of '%s'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:336
+#, python-format
+msgid "Host filter forcing available nodes to %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:339
+#, python-format
+msgid "No nodes matched due to not matching 'force_nodes' value of '%s'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:379
+#, python-format
+msgid "Ignoring %(service_name)s service update from %(host)s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:385
+#, python-format
+msgid "Received %(service_name)s service update from %(state_key)s."
+msgstr ""
+
+#: nova/scheduler/host_manager.py:405
+#: nova/scheduler/filters/trusted_filter.py:214
+#, python-format
+msgid "No service for compute ID %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:427
+#, python-format
+msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:71
+#, python-format
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:80
+#, python-format
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
+
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
+#: nova/scheduler/filters/affinity_filter.py:95
+#, python-format
+msgid "Group affinity: %(host)s in %(configured)s"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_instance_extra_specs.py:49
+#, python-format
+msgid ""
+"%(host_state)s fails instance_type extra_specs requirements. Extra_spec "
+"%(key)s is not in aggregate."
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_instance_extra_specs.py:57
+#, python-format
+msgid ""
+"%(host_state)s fails instance_type extra_specs requirements. "
+"'%(aggregate_vals)s' do not match '%(req)s'"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
+#, python-format
+msgid "%s fails tenant id on aggregate"
+msgstr ""
+
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:40
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:44
+#, python-format
+msgid "%(host_state)s is disabled via capabilities"
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:50
+msgid "VCPUs not set; assuming CPU collection broken"
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/filters/disk_filter.py:47
+#, python-format
+msgid ""
+"%(host_state)s does not have %(requested_disk)s MB usable disk, it only "
+"has %(usable_disk_mb)s MB usable disk."
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:48
+#, python-format
+msgid ""
+"Instance contains properties %(image_props)s, but no corresponding "
+"capabilities are advertised by the compute node"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:61
+#, python-format
+msgid ""
+"Instance properties %(image_props)s are satisfied by compute host "
+"capabilities %(capabilities)s"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:68
+#, python-format
+msgid ""
+"Instance contains properties %(image_props)s that are not provided by the"
+" compute node capabilities %(capabilities)s"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:86
+#, python-format
+msgid "%(host_state)s does not support requested instance_properties"
+msgstr ""
+
+#: nova/scheduler/filters/io_ops_filter.py:42
+#, python-format
+msgid ""
+"%(host_state)s fails I/O ops check: Max IOs per host is set to "
+"%(max_io_ops)s"
+msgstr ""
+
+#: nova/scheduler/filters/num_instances_filter.py:39
+#, python-format
+msgid ""
+"%(host_state)s fails num_instances check: Max instances per host is set "
+"to %(max_instances)s"
+msgstr ""
+
+#: nova/scheduler/filters/ram_filter.py:55
+#, python-format
+msgid ""
+"%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
+" %(usable_ram)s MB usable ram."
+msgstr ""
+
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/filters/retry_filter.py:41
+#, python-format
+msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
+msgstr ""
+
+#: nova/servicegroup/api.py:60
+#, python-format
+msgid "ServiceGroup driver defined as an instance of %s"
+msgstr ""
+
+#: nova/servicegroup/api.py:66
+#, python-format
+msgid "unknown ServiceGroup driver name: %s"
+msgstr ""
+
+#: nova/servicegroup/api.py:83
+#, python-format
+msgid ""
+"Join new ServiceGroup member %(member_id)s to the %(group_id)s group, "
+"service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/api.py:90
+#, python-format
+msgid "Check if the given member [%s] is part of the ServiceGroup, is up"
+msgstr ""
+
+#: nova/servicegroup/api.py:99
+#, python-format
+msgid ""
+"Explicitly remove the given member %(member_id)s from the%(group_id)s "
+"group monitoring"
+msgstr ""
+
+#: nova/servicegroup/api.py:106
+#, python-format
+msgid "Returns ALL members of the [%s] ServiceGroup"
+msgstr ""
+
+#: nova/servicegroup/api.py:114
+#, python-format
+msgid "Returns one member of the [%s] group"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:41
+#, python-format
+msgid ""
+"DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
+" group, service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:45
+msgid "service is a mandatory argument for DB based ServiceGroup driver"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:72
+#, python-format
+msgid "DB_Driver: get_all members of the %s group"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
+msgid "Recovered model server connection!"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
+msgid "model server went away"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:43
+msgid "memcached_servers not defined"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:51
+#, python-format
+msgid ""
+"Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
+"%(group_id)s group, service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:56
+msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:74
+#, python-format
+msgid "Memcached_Driver: get_all members of the %s group"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:80
+#, python-format
+msgid ""
+"ZooKeeperDriver: join new member %(id)s to the %(gr)s group, "
+"service=%(sr)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:90
+msgid ""
+"Unable to join. It is possible that either another node exists with the "
+"same name, or this node just restarted. We will try again in a short "
+"while to make sure."
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:101
+#, python-format
+msgid "ZooKeeperDriver.leave: %(member)s from group %(group)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:109
+#, python-format
+msgid "ZooKeeperDriver.leave: %(id)s has not joined to the %(gr)s group"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:71
+#, python-format
+msgid "Trying (%(tries)s) to remove device %(device)s"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:101
+#, python-format
+msgid "Multipath call failed exit (%(code)s)"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:122
+#, python-format
+msgid "Couldn't find multipath device %(line)s"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:126
+#, python-format
+msgid "Found multipath device = %(mdev)s"
+msgstr ""
+
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:71
+#, python-format
+msgid "Faking execution of cmd (subprocess): %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:79
+#, python-format
+msgid "Faked command matched %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:95
+#, python-format
+msgid "Faked command raised an exception %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:100
+#, python-format
+msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
+msgstr ""
+
+#: nova/tests/fake_volume.py:188
+msgid "status must be available"
+msgstr ""
+
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
+msgid "already attached"
+msgstr ""
+
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
+msgid "Instance and volume not in same availability_zone"
+msgstr ""
+
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
+msgid "already detached"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:79
+msgid "200 Role Match"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:81
+msgid "200 No Roles"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:84
+msgid "unexpected role header"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3504
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
+msgid ""
+"Quota exceeded for instances: Requested 1, but already used 10 of 10 "
+"instances"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3509
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
+msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3514
+#: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
+msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1239
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
+#, python-format
+msgid "Running instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
+#, python-format
+msgid "After terminating instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1949
+msgid "Internal error"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:4271
+#, python-format
+msgid "After force-killing instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:4782
+msgid "wrong host/node"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:9713
+msgid "spawn error"
+msgstr ""
+
+#: nova/tests/db/test_migrations.py:1805
+#, python-format
+msgid ""
+"The following migrations are missing a downgrade:\n"
+"\t%s"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:183
+#, python-format
+msgid "%(result_str)s: %(result)s is not a dict."
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:197
+#, python-format
+msgid ""
+"Dictionary key mismatch:\n"
+"Extra key(s) in template:\n"
+"%(ex_delta)s\n"
+"Extra key(s) in %(result_str)s:\n"
+"%(res_delta)s\n"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:208
+#, python-format
+msgid "%(result_str)s: %(result)s is not a list."
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:227
+msgid "Extra list items in template:"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:231
+#, python-format
+msgid "Extra list items in %(result_str)s:"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
+#, python-format
+msgid ""
+"Values do not match:\n"
+"Template: %(expected)s\n"
+"%(result_str)s: %(result)s"
+msgstr ""
+
+#: nova/tests/integrated/test_login.py:31
+#, python-format
+msgid "flavor: %s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:38
+#, python-format
+msgid ""
+"%(message)s\n"
+"Status Code: %(_status)s\n"
+"Body: %(_body)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:47
+msgid "Authentication error"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:55
+msgid "Authorization error"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:63
+msgid "Item not found"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:105
+#, python-format
+msgid "Doing %(method)s on %(relative_url)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:107
+#, python-format
+msgid "Body: %s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:125
+#, python-format
+msgid "%(auth_uri)s => code %(http_status)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:155
+#, python-format
+msgid "%(relative_uri)s => code %(http_status)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:165
+msgid "Unexpected status code"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:172
+#, python-format
+msgid "Decoding JSON: %s"
+msgstr ""
+
+#: nova/tests/virt/hyperv/test_hypervapi.py:433
+msgid "fake vswitch not found"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
+#: nova/tests/virt/xenapi/test_vm_utils.py:370
+#: nova/virt/xenapi/vm_utils.py:2181
+#, python-format
+msgid ""
+"Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
+"left to copy"
+msgstr ""
+
+#: nova/tests/virt/xenapi/test_xenapi.py:900
+#, python-format
+msgid "Creating files in %s to simulate guest agent"
+msgstr ""
+
+#: nova/tests/virt/xenapi/test_xenapi.py:911
+#, python-format
+msgid "Removing simulated guest agent files in %s"
+msgstr ""
+
+#: nova/virt/configdrive.py:97
+#, python-format
+msgid "Added %(filepath)s to config drive"
+msgstr ""
+
+#: nova/virt/driver.py:949
+msgid "Event must be an instance of nova.virt.event.Event"
+msgstr ""
+
+#: nova/virt/driver.py:955
+#, python-format
+msgid "Exception dispatching event %(event)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/driver.py:977
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/virt/driver.py:980
+#, python-format
+msgid "Loading compute driver '%s'"
+msgstr ""
+
+#: nova/virt/driver.py:987
+msgid "Unable to load the virtualization driver"
+msgstr ""
+
+#: nova/virt/fake.py:212
+#, python-format
+msgid "Key '%(key)s' not in instances '%(inst)s'"
+msgstr ""
+
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr ""
+
+#: nova/virt/firewall.py:200
+msgid "Filters added to instance"
+msgstr ""
+
+#: nova/virt/firewall.py:202
+msgid "Provider Firewall Rules refreshed"
+msgstr ""
+
+#: nova/virt/firewall.py:383
+#, python-format
+msgid "Adding security group rule: %r"
+msgstr ""
+
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
+#, python-format
+msgid "Adding provider rule: %s"
+msgstr ""
+
+#: nova/virt/images.py:114
+msgid "Snapshot list encountered but no header found!"
+msgstr ""
+
+#: nova/virt/images.py:203
+msgid "'qemu-img info' parsing failed."
+msgstr ""
+
+#: nova/virt/images.py:209
+#, python-format
+msgid "fmt=%(fmt)s backed by: %(backing_file)s"
+msgstr ""
+
+#: nova/virt/images.py:221
+#, python-format
+msgid "Converted to raw, but format is now %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:90
+#, python-format
+msgid "Request for baremetal node %s sent to wrong service host"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:143
+msgid "cpu_arch is not found in instance_type_extra_specs"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:185
+#, python-format
+msgid "Baremetal node id not supplied to driver for %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:259
+#, python-format
+msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:286
+#, python-format
+msgid "Baremetal power manager failed to restart node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:297
+#, python-format
+msgid "Destroy called on non-existing instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:315
+#, python-format
+msgid "Error from baremetal driver during destroy: %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:320
+#, python-format
+msgid "Error while recording destroy failure in baremetal database: %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:330
+#, python-format
+msgid "Baremetal power manager failed to stop node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:343
+#, python-format
+msgid "Baremetal power manager failed to start node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:86
+#, python-format
+msgid "pid file %s does not contain any pid"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:109
+msgid "Node id not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:112
+msgid "Address not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:115
+msgid "User not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:118
+msgid "Password not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:135
+#, python-format
+msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:157
+msgid "IPMI power on failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:179
+msgid "IPMI power off failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:189
+msgid "IPMI set next bootdev failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
+#, python-format
+msgid "Activate node called, but node %s is already active"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:109
+#, python-format
+msgid "Building PXE config for deployment %s."
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:228
+#, python-format
+msgid ""
+"Can not activate PXE bootloader. The following boot parameters were not "
+"passed to baremetal driver: %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
+#, python-format
+msgid "Fetching kernel and ramdisk for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
+#, python-format
+msgid "Fetching image %(ami)s for instance %(name)s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
+#, python-format
+msgid "Injecting files into image for instance %(name)s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
+#, python-format
+msgid "Node associated with another instance while waiting for deploy of %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:464
+#, python-format
+msgid "PXE deploy started for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:469
+#, python-format
+msgid "PXE deploy completed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:473
+#, python-format
+msgid "PXE deploy failed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
+#, python-format
+msgid "Baremetal node deleted while waiting for deployment of instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:480
+#, python-format
+msgid "Timeout reached while waiting for PXE deploy of instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:121
+#, python-format
+msgid ""
+"Can not activate Tilera bootloader. The following boot parameters were "
+"not passed to baremetal driver: %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:338
+#, python-format
+msgid "Tilera deploy started for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:344
+#, python-format
+msgid "Tilera deploy completed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:352
+msgid "Node is unknown error state."
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:355
+#, python-format
+msgid "Tilera deploy failed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:83
+msgid "Node id not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:86
+msgid "Address not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:89
+msgid "User not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:92
+msgid "Password not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:117
+msgid "PDU failed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:134
+msgid "PDU power on failed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:147
+msgid "PDU power off failed"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:41
+#, python-format
+msgid "Failed to inject data into image %(image)s. Error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:52
+#, python-format
+msgid "Failed to unlink %(path)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:60
+#, python-format
+msgid "Failed to remove dir %(path)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:75
+#, python-format
+msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:37
+#, python-format
+msgid "plug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:50
+#, python-format
+msgid "pif:%(id)s is plugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:57
+#, python-format
+msgid ""
+"Baremetal node: %(id)s has no available physical interface for virtual "
+"interface %(vif_uuid)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:63
+#, python-format
+msgid "unplug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:71
+#, python-format
+msgid "pif:%(id)s is unplugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:75
+#, python-format
+msgid "no pif for vif_uuid=%s"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:109
+msgid "virtual_power_ssh_host not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:113
+msgid "virtual_power_host_user not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:119
+msgid "virtual_power_host_pass/key not set. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:123
+#, python-format
+msgid "baremetal driver was unable to delete tid %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:187
+#, python-format
+msgid "Could not determine iscsi initiator name for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:227
+#, python-format
+msgid "No fixed PXE IP is associated to %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:260
+#, python-format
+msgid "detach volume could not find tid for %s"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:199
+msgid "instance_uuid must be supplied to bm_node_associate_and_update"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:211
+#, python-format
+msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
+#, python-format
+msgid "Baremetal interface %s not found"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
+#, python-format
+msgid "Baremetal interface %s already in use"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
+#, python-format
+msgid "Baremetal virtual interface %s not found"
+msgstr ""
+
+#: nova/virt/disk/api.py:133
+#, python-format
+msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:140
+#, python-format
+msgid "Cannot resize filesystem %s to a smaller size."
+msgstr ""
+
+#: nova/virt/disk/api.py:151
+#, python-format
+msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
+msgstr ""
+
+#: nova/virt/disk/api.py:161
+#, python-format
+msgid ""
+"Unable to determine label for image %(image)s with error %(errror)s. "
+"Cannot resize."
+msgstr ""
+
+#: nova/virt/disk/api.py:228
+msgid "image already mounted"
+msgstr ""
+
+#: nova/virt/disk/api.py:284
+#, python-format
+msgid ""
+"Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:302
+#, python-format
+msgid "Ignoring error injecting data into image (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:321
+#, python-format
+msgid ""
+"Failed to mount container filesystem '%(image)s' on '%(target)s': "
+"%(errors)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:338
+#, python-format
+msgid "Failed to teardown ntainer filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:351
+#, python-format
+msgid "Failed to umount container filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:376
+#, python-format
+msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:388
+#, python-format
+msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:397
+#, python-format
+msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:438
+#, python-format
+msgid "Inject key fs=%(fs)s key=%(key)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:466
+#, python-format
+msgid "Inject key fs=%(fs)s net=%(net)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:491
+#, python-format
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
+msgstr ""
+
+#: nova/virt/disk/api.py:535
+msgid "Not implemented on Windows"
+msgstr ""
+
+#: nova/virt/disk/api.py:564
+#, python-format
+msgid "User %(username)s not found in password file."
+msgstr ""
+
+#: nova/virt/disk/api.py:580
+#, python-format
+msgid "User %(username)s not found in shadow file."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:41
+#, python-format
+msgid ""
+"Instance for format imgfile=%(imgfile)s mountdir=%(mountdir)s "
+"partition=%(partition)s imgfmt=%(imgfmt)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
+#: nova/virt/disk/vfs/localfs.py:68
+msgid "Using LoopMount"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
+#: nova/virt/disk/vfs/localfs.py:73
+msgid "Using NbdMount"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:57
+#, python-format
+msgid ""
+"Instance for device imgfile=%(imgfile)s mountdir=%(mountdir)s "
+"partition=%(partition)s device=%(device)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:117
+msgid "Device allocation failed. Will retry in 2 seconds."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:120
+msgid "Device allocation failed after repeated retries."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:135
+#, python-format
+msgid "Map dev %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:140
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:156
+#, python-format
+msgid "partition %s not found"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:157
+#, python-format
+msgid "Failed to map partitions: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:179
+#, python-format
+msgid "Unmap dev %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:187
+#, python-format
+msgid "Mount %(dev)s on %(dir)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:192
+#, python-format
+msgid "Failed to mount filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:203
+#, python-format
+msgid "Umount %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:214
+msgid "Fail to mount, tearing back down"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:33
+#, python-format
+msgid "Could not attach image to loopback: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:34
+#, python-format
+msgid "Loop mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:40
+#, python-format
+msgid "Got loop device %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:58
+#, python-format
+msgid "Release loop device %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:55 nova/virt/disk/mount/nbd.py:69
+msgid "No free nbd devices"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:60
+msgid "nbd module not loaded"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:61
+msgid "nbd unavailable: module not loaded"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:86
+#, python-format
+msgid "Get nbd device %(dev)s for %(imgfile)s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:91
+#, python-format
+msgid "qemu-nbd error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:92 nova/virt/disk/mount/nbd.py:105
+#, python-format
+msgid "NBD mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:104
+#, python-format
+msgid "nbd device %s did not show up"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:111
+#, python-format
+msgid "Detaching from erroneous nbd device returned error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:126
+#, python-format
+msgid "Release nbd device %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:27
+#, python-format
+msgid ""
+"Instance for image imgfile=%(imgfile)s imgfmt=%(imgfmt)s "
+"partition=%(partition)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:32
+msgid "Trying to import guestfs"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:39
+msgid "Using primary VFSGuestFS"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:44
+msgid "Falling back to VFSLocalFS"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:55
+#, python-format
+msgid "Mount guest OS image %(imgfile)s partition %(part)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:64
+#, python-format
+msgid "Inspecting guest OS image %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:68
+#, python-format
+msgid "No operating system found in %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:72
+#, python-format
+msgid "Multi-boot OS %(roots)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:74
+#, python-format
+msgid "Multi-boot operating system found in %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:80
+#, python-format
+msgid "Inspecting guest OS root filesystem %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:85
+#, python-format
+msgid "No mount points found in %(root)s of %(imgfile)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:90
+#, python-format
+msgid "Mounting %(dev)s at %(dir)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:95
+#, python-format
+msgid "Setting up appliance for %(imgfile)s %(imgfmt)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:113
+#, python-format
+msgid "Error mounting %(imgfile)s with libguestfs (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:120
+msgid "Tearing down appliance"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:126
+#, python-format
+msgid "Failed to close augeas %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:134
+#, python-format
+msgid "Failed to shutdown appliance %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:142
+#, python-format
+msgid "Failed to close guest handle %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:154 nova/virt/disk/vfs/localfs.py:102
+#, python-format
+msgid "Make directory path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:159 nova/virt/disk/vfs/localfs.py:107
+#, python-format
+msgid "Append file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:164 nova/virt/disk/vfs/localfs.py:116
+#, python-format
+msgid "Replace file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:169 nova/virt/disk/vfs/localfs.py:125
+#, python-format
+msgid "Read file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:174 nova/virt/disk/vfs/localfs.py:131
+#, python-format
+msgid "Has file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:183
+#, python-format
+msgid "Set permissions path=%(path)s mode=%(mode)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:188
+#, python-format
+msgid "Set ownership path=%(path)s user=%(user)s group=%(group)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:201
+#, python-format
+msgid "chown uid=%(uid)d gid=%(gid)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:47
+#, python-format
+msgid "File path %s not valid"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:82
+#, python-format
+msgid "Failed to mount image %(ex)s)"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:90
+#, python-format
+msgid "Failed to unmount %(imgdir)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:96
+#, python-format
+msgid "Failed to remove %(imgdir)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:139
+#, python-format
+msgid "Set permissions path=%(path)s mode=%(mode)o"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:144
+#, python-format
+msgid "Set permissions path=%(path)s user=%(user)s group=%(group)s"
+msgstr ""
+
+#: nova/virt/hyperv/basevolumeutils.py:71
+msgid "The ISCSI initiator name can't be found. Choosing the default one"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:151
+msgid "plug_vifs called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:154
+msgid "unplug_vifs called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:157
+msgid "ensure_filtering_rules_for_instance called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:161
+msgid "unfilter_instance called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:192
+msgid "get_console_output called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:93
+#, python-format
+msgid "Windows version: %s "
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:105
+msgid "get_available_resource called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
+#: nova/virt/xenapi/host.py:148
+msgid "Updating host stats"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:161
+msgid "get_host_stats called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:176
+#, python-format
+msgid "Host IP address is: %s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:49
+#, python-format
+msgid "The image is not a valid VHD: %s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:69
+#, python-format
+msgid ""
+"Cannot resize the image to a size smaller than the VHD max. internal "
+"size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:84
+#, python-format
+msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:87
+#, python-format
+msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:45
+msgid "live_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:55
+#, python-format
+msgid "Calling live migration recover_method for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:59
+#, python-format
+msgid "Calling live migration post_method for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:65
+msgid "pre_live_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:78
+msgid "post_live_migration_at_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:85
+msgid "check_can_live_migrate_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:90
+msgid "check_can_live_migrate_destination_cleanup called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:94
+msgid "check_can_live_migrate_source called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:43
+#, python-format
+msgid "Live migration is not supported on target host \"%s\""
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:46
+#, python-format
+msgid "Target live migration host \"%s\" is unreachable"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:49
+#, python-format
+msgid "Live migration failed: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:61
+msgid "Live migration is not enabled on this host"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:64
+msgid "Live migration networks are not configured on this host"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:70 nova/virt/hyperv/vmutils.py:103
+#, python-format
+msgid "VM not found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:72 nova/virt/hyperv/vmutils.py:112
+#, python-format
+msgid "Duplicate VM name found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:77
+#, python-format
+msgid "Destroying existing remote planned VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:99
+#, python-format
+msgid "Creating remote planned VM for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:156
+#, python-format
+msgid ""
+"Replacing host resource %(old_disk_path)s with %(new_disk_path)s on "
+"planned VM %(vm_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:163
+#, python-format
+msgid "Updating remote planned VM disk paths for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:199
+#, python-format
+msgid "Starting live migration for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:208
+#, python-format
+msgid "Getting live migration networks for remote host: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:50
+msgid "Migration target is the source host"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:52
+#, python-format
+msgid "Migration target host: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:73
+#, python-format
+msgid "Copying disk \"%(disk_file)s\" to \"%(dest_path)s\""
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:96
+msgid "Cannot cleanup migration files"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:103
+#, python-format
+msgid ""
+"Cannot resize the root disk to a smaller size. Current size: "
+"%(curr_root_gb)s GB. Requested size: %(new_root_gb)s GB"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:113
+msgid "migrate_disk_and_power_off called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:133
+msgid "confirm_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:148
+msgid "finish_revert_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:167
+#, python-format
+msgid "Copying base disk %(base_vhd_path)s to %(base_vhd_copy_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:171
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(base_vhd_copy_path)s and diff VHD "
+"%(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:177
+#, python-format
+msgid "Merging base disk %(base_vhd_copy_path)s and diff disk %(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:189
+#, python-format
+msgid "Getting info for disk: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:194
+#, python-format
+msgid "Resizing disk \"%(vhd_path)s\" to new max size %(new_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:205
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(base_vhd_path)s and diff VHD "
+"%(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:214
+msgid "finish_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:223
+#, python-format
+msgid "Cannot find boot VHD file: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:236 nova/virt/hyperv/vmops.py:136
+msgid "Cannot resize a VHD to a smaller size"
+msgstr ""
+
+#: nova/virt/hyperv/networkutils.py:46
+#, python-format
+msgid "vswitch \"%s\" not found"
+msgstr ""
+
+#: nova/virt/hyperv/networkutils.py:59
+#, python-format
+msgid "Failed to create vswitch port %(port_name)s on switch %(vswitch_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:71
+#, python-format
+msgid "The file copy from %(src)s to %(dest)s failed"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:92
+#, python-format
+msgid "Creating directory: %s"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
+#, python-format
+msgid "Removing directory: %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:56
+#, python-format
+msgid "Creating snapshot for instance %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:65
+#, python-format
+msgid "Getting info for VHD %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:73
+#, python-format
+msgid "Copying VHD %(src_vhd_path)s to %(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:83
+#, python-format
+msgid "Copying base disk %(src_vhd_path)s to %(dest_base_disk_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:88
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(dest_base_disk_path)s and diff VHD "
+"%(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:94
+#, python-format
+msgid "Merging base disk %(dest_base_disk_path)s and diff disk %(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:99
+#, python-format
+msgid ""
+"Updating Glance image %(image_id)s with content from merged disk "
+"%(image_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:105
+#, python-format
+msgid "Snapshot image %(image_id)s updated for VM %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:109
+#, python-format
+msgid "Removing snapshot %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:113
+#, python-format
+msgid "Failed to remove snapshot for VM %s"
+msgstr ""
+
+#: nova/virt/hyperv/vif.py:75
+#, python-format
+msgid "Creating vswitch port for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:91
+#, python-format
+msgid "VIF driver not found for network_api_class: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:100
+msgid "get_info called for instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:121
+#, python-format
+msgid ""
+"Creating differencing VHD. Parent: %(base_vhd_path)s, Target: "
+"%(root_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:127
+#, python-format
+msgid "Copying VHD image %(base_vhd_path)s to target: %(root_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:139
+#, python-format
+msgid "Resizing VHD %(root_vhd_path)s to new size %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:152
+msgid "Spawning new instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:178
+msgid "Spawn instance failed"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:203
+#, python-format
+msgid "Creating nic for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:211
+#, python-format
+msgid "Invalid config_drive_format \"%s\""
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:214
+#, python-format
+msgid "Using config drive for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
+#, python-format
+msgid "Creating config drive at %(path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
+#, python-format
+msgid "Creating config drive failed with error: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:271
+#, python-format
+msgid "Got request to destroy instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:284
+#, python-format
+msgid "Instance not found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:290
+#, python-format
+msgid "Failed to destroy instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:295
+msgid "reboot instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:301
+msgid "Pause instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:307
+msgid "Unpause instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:313
+msgid "Suspend instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:319
+msgid "Resume instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:325
+msgid "Power off instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:331
+msgid "Power on instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:338
+#, python-format
+msgid "Successfully changed state of VM %(vm_name)s to: %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:342
+#, python-format
+msgid "Failed to change vm state of %(vm_name)s to %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:83
+#, python-format
+msgid "Cannot get VM summary data for: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:160
+#, python-format
+msgid "Creating VM %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:169
+#, python-format
+msgid "Setting memory for vm %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:172
+#, python-format
+msgid "Set vCPUs for vm %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:270
+msgid "Controller not found"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:332
+#, python-format
+msgid "Successfully changed vm state of %(vm_name)s to %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:373
+#, python-format
+msgid "Operation failed with return value: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:391
+#, python-format
+msgid ""
+"WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
+" - %(err_desc)s - Error code: %(err_code)d"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:399
+#, python-format
+msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:403
+#, python-format
+msgid "WMI job failed with status %(job_state)d. No error description available"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:409
+#, python-format
+msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:98
+#, python-format
+msgid ""
+"Already logged in on storage target. No need to login. Portal: "
+"%(target_portal)s, IQN: %(target_iqn)s, LUN: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:102
+#, python-format
+msgid ""
+"Logging in on storage target. Portal: %(target_portal)s, IQN: "
+"%(target_iqn)s, LUN: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:115
+#, python-format
+msgid "Attach_volume: %(connection_info)s to %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:145
+#, python-format
+msgid "Attach volume failed: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:147
+#, python-format
+msgid "Unable to attach volume to instance %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:160
+#, python-format
+msgid "Logging off storage target %(target_iqn)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:165
+#, python-format
+msgid "Detach_volume: %(connection_info)s from %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:176
+#, python-format
+msgid "Detaching physical disk from instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
+msgid "Could not determine iscsi initiator name"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:198 nova/virt/hyperv/volumeops.py:211
+#, python-format
+msgid "Unable to find a mounted disk for target_iqn: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:200
+#, python-format
+msgid "Device number: %(device_number)s, target lun: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeutils.py:51
+#, python-format
+msgid "An error has occurred when calling the iscsi initiator: %s"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:129
+#, python-format
+msgid "Unable to determine disk prefix for %s"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:177
+#, python-format
+msgid "No free disk device names for prefix '%s'"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:269
+#, python-format
+msgid "Unable to determine disk bus for '%s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:354
+#, python-format
+msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:565
+#, python-format
+msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:579
+#, python-format
+msgid "Connecting to libvirt: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:597
+#, python-format
+msgid "URI %s does not support events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:607
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:617
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:630
+msgid "Connection to libvirt broke"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
+#, python-format
+msgid "Can not handle authentication request for %d credentials"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:673
+#, python-format
+msgid "Connection to libvirt failed: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:782
+#, python-format
+msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:798
+msgid "During wait destroy, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:803
+msgid "Instance destroyed successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:813
+msgid "Instance may be started again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:823
+msgid "Going to destroy instance again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:842
+msgid "Error from libvirt during undefineFlags. Retrying with undefine"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:858
+#, python-format
+msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:878
+msgid "Instance may be still running, destroy it again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:884
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:913
+#, python-format
+msgid "Deleting instance files %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:922
+#, python-format
+msgid "Failed to cleanup directory %(target)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:965
+msgid "Could not determine fibre channel world wide node names"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:972
+msgid "Could not determine fibre channel world wide port names"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1096
+msgid "During detach_volume, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1120
+msgid "attaching network adapter failed."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1140
+msgid "During detach_interface, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1144
+msgid "detaching network adapter failed."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1242
+msgid "Beginning live snapshot process"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1245
+msgid "Beginning cold snapshot process"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1274
+msgid "Snapshot extracted, beginning image upload"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1286
+msgid "Snapshot image upload complete"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1352
+msgid "Instance soft rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1356
+msgid "Failed to soft reboot instance."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1394
+msgid "Instance shutdown successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1402
+msgid "Instance may have been rebooted during soft reboot, so return now."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1451
+msgid "Instance rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1597
+msgid "Instance is running"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
+msgid "Instance spawned successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1620
+#, python-format
+msgid "data: %(data)r, fpath: %(fpath)r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
+#, python-format
+msgid "Truncated console log returned, %d bytes ignored"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
+msgid "Guest does not have a console available"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1742
+#, python-format
+msgid "Path '%(path)s' supports direct I/O"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1746
+#, python-format
+msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
+#, python-format
+msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1827
+msgid "Creating image"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1928
+msgid "Using config drive"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1981
+#, python-format
+msgid "Injecting %(inj)s into image %(img_id)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1993
+#, python-format
+msgid "Error injecting data into image %(img_id)s (%(e)s)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2053
+#, python-format
+msgid ""
+"Config requested an explicit CPU model, but the current libvirt "
+"hypervisor '%s' does not support selecting CPU models"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2059
+msgid "Config requested a custom CPU model, but no model name was provided"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2063
+msgid "A CPU model name should not be set when a host CPU model is requested"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2067
+#, python-format
+msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2083
+msgid ""
+"Passthrough of the host CPU was requested but this libvirt version does "
+"not support this feature"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2407
+#, python-format
+msgid ""
+"Start to_xml instance=%(instance)s network_info=%(network_info)s "
+"disk_info=%(disk_info)s image_meta=%(image_meta)s "
+"rescue=%(rescue)sblock_device_info=%(block_device_info)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2424
+#, python-format
+msgid "End to_xml instance=%(instance)s xml=%(xml)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2442
+#, python-format
+msgid ""
+"Error from libvirt while looking up %(instance_id)s: [Error Code "
+"%(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2463
+#, python-format
+msgid ""
+"Error from libvirt while looking up %(instance_name)s: [Error Code "
+"%(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
+#, python-format
+msgid "Invalid range expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2679
+#, python-format
+msgid "Invalid exclusion expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2686
+#, python-format
+msgid "Invalid inclusion expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2691
+#, python-format
+msgid "No CPUs available after parsing %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2708
+msgid ""
+"Cannot get the number of cpu, because this function is not implemented "
+"for this platform. "
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2718
+msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2770
+#, python-format
+msgid "couldn't obtain the vpu count from domain id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2842
+msgid "libvirt version is too old (does not support getVersion)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2927
+#, python-format
+msgid "Trying to get stats for the volume %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2940
+#, python-format
+msgid ""
+"Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
+"rd_req=%(rd_req)d, rd_bytes=%(rd_bytes)d, wr_req=%(wr_req)d, "
+"wr_bytes=%(wr_bytes)d"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2958
+#, python-format
+msgid ""
+"Getting block stats failed, device might have been detached. "
+"Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2964
+#, python-format
+msgid ""
+"Could not find domain in libvirt for instance %s. Cannot get block stats "
+"for device"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3041
+#, python-format
+msgid ""
+"Creating tmpfile %s to verify with other compute node that the instance "
+"is on the same shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3122
+msgid "Block migration can not be used with shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3130
+msgid "Live migration can not be used without shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3174
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s: Disk of instance is too "
+"large(available on destination host:%(available)s < need:%(necessary)s)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3202
+#, python-format
+msgid ""
+"Instance launched has CPU info:\n"
+"%s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3214
+#, python-format
+msgid ""
+"CPU doesn't have compatibility.\n"
+"\n"
+"%(ret)s\n"
+"\n"
+"Refer to %(u)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3231
+#, python-format
+msgid ""
+"Creating tmpfile %s to notify to other compute nodes that they should "
+"mount the same storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3281
+#, python-format
+msgid "The firewall filter for %s does not exist"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3455
+#, python-format
+msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3568
+#, python-format
+msgid ""
+"Error from libvirt while getting description of %(instance_name)s: [Error"
+" Code %(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3600
+#, python-format
+msgid "skipping %s since it looks like volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3604
+#, python-format
+msgid "skipping disk for %s as it does not have a path"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3719
+msgid "Starting migrate_disk_and_power_off"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3788
+msgid "Instance running successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3794
+msgid "Starting finish_migration"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3859
+msgid "Starting finish_revert_migration"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3982
+#, python-format
+msgid "Checking instance files accessability %s"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:51
+msgid ""
+"Libvirt module could not be loaded. NWFilterFirewall will not work "
+"correctly."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:108
+msgid "Called setup_basic_filtering in nwfilter"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:116
+msgid "Ensuring static filters"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:248
+#, python-format
+msgid "The nwfilter(%s) is not found."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:270
+#, python-format
+msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:288
+msgid "iptables firewall: Setup Basic Filtering"
+msgstr ""
+
+#: nova/virt/libvirt/imagebackend.py:319
+msgid "You should specify libvirt_images_volume_group flag to use LVM images."
+msgstr ""
+
+#: nova/virt/libvirt/imagebackend.py:403
+#, python-format
+msgid "Unknown image_type=%s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:139
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:178
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:200
+#, python-format
+msgid "Writing stored info to %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:329
+#, python-format
+msgid "%s is a valid instance name"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:332
+#, python-format
+msgid "%s has a disk file"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:334
+#, python-format
+msgid "Instance %(instance)s is backed by %(backing)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:347
+#, python-format
+msgid ""
+"Instance %(instance)s is using a backing file %(backing)s which does not "
+"appear in the image service"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:422
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image verification failed"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:432
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): image verification skipped, no hash "
+"stored"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:441
+#, python-format
+msgid "%(id)s (%(base_file)s): generating checksum"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:456
+#, python-format
+msgid "Cannot remove %(base_file)s, it does not exist"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:468
+#, python-format
+msgid "Base file too young to remove: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:471
+#, python-format
+msgid "Removing base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:478
+#, python-format
+msgid "Failed to remove %(base_file)s, error was %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:489
+#, python-format
+msgid "image %(id)s at (%(base_file)s): checking"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:513
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
+"%(remote)d on other nodes sharing this instance storage"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:525
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): warning -- an absent base file is in "
+"use! instances: %(instance_list)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:537
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image is not in use"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:544
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image is in use"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:568
+#, python-format
+msgid "Skipping verification, no base directory at %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:572
+msgid "Verify base images"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:579
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:597
+#, python-format
+msgid "Unknown base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:602
+#, python-format
+msgid "Active base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:605
+#, python-format
+msgid "Corrupt base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:609
+#, python-format
+msgid "Removable base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:617
+msgid "Verification complete"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:77 nova/virt/libvirt/utils.py:83
+msgid "systool is not installed"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:87
+msgid "Cannot find any Fibre Channel HBAs"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:229
+#, python-format
+msgid ""
+"Insufficient Space on Volume Group %(vg)s. Only %(free_space)db "
+"available, but %(size)db required by volume %(lv)s."
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:242
+#, python-format
+msgid ""
+"Volume group %(vg)s will not be able to hold sparse volume %(lv)s. "
+"Virtual volume size is %(size)db, but free space on volume group is only "
+"%(free_space)db."
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:277
+#, python-format
+msgid "vg %s must be LVM volume group"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:306
+#, python-format
+msgid "Path %s must be LVM logical volume"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:572
+msgid "Can't retrieve root device path from instance libvirt configuration"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
+#, python-format
+msgid ""
+"vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
+"mapping=%(mapping)s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
+msgid "vif_type parameter must be present for this vif_driver implementation"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
+#, python-format
+msgid "Unexpected vif_type=%s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:338
+#, python-format
+msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:348
+#, python-format
+msgid "Ensuring bridge %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
+msgid "Failed while unplugging vif"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:624
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:651
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:680
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:709
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:736
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:240
+#, python-format
+msgid "iSCSI device not found at %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:243
+#, python-format
+msgid ""
+"ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
+"number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:256
+#, python-format
+msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
+#, python-format
+msgid "%s is already mounted"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:562
+#, python-format
+msgid "AoE device not found at %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:564
+#, python-format
+msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:579
+#, python-format
+msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:706
+msgid "We are unable to locate any Fibre Channel devices"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:715
+#, python-format
+msgid "Looking for Fibre Channel dev %(device)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:725
+msgid "Fibre Channel device not found."
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:728
+#, python-format
+msgid ""
+"Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
+"Try number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:745
+#, python-format
+msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:754
+#, python-format
+msgid "Multipath device discovered %(device)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:831
+msgid "Value required for 'scality_sofs_config'"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:842
+#, python-format
+msgid "Cannot access 'scality_sofs_config': %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:848
+msgid "Cannot execute /sbin/mount.sofs"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:863
+msgid "Cannot mount Scality SOFS, check syslog for errors"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:149
+#, python-format
+msgid "Removing the logical volume '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:167
+#, python-format
+msgid "Fetching image '%s' from glance"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:172
+#, python-format
+msgid "Using image found at '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:174
+#, python-format
+msgid "Ensuring image '%s' exists on IVM"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:186
+#, python-format
+msgid "Creating logical volume of size %s bytes"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:189
+#, python-format
+msgid "Copying image to the device '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:192
+msgid "Error while creating logical volume from image. Will attempt cleanup."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:200
+msgid "Error while attempting cleanup of failed deploy to logical volume."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:246
+msgid "Snapshot added to glance."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:252
+#, python-format
+msgid "Failed to clean up snapshot file %(snapshot_file_path)s"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:337
+msgid "Could not create logical volume. No space left on any volume group."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:437 nova/virt/powervm/blockdev.py:517
+msgid "Unable to get checksum"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:444 nova/virt/powervm/blockdev.py:533
+msgid "Image checksums do not match"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:469
+#, python-format
+msgid "Image found on host at '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:477
+msgid "Uncompressed image file not found"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:555 nova/virt/powervm/operator.py:677
+#, python-format
+msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:572 nova/virt/powervm/operator.py:694
+#, python-format
+msgid "Found error stream for command \"%(command)s\": %(error_text)s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:67
+msgid "Connection error connecting PowerVM manager"
+msgstr ""
+
+#: nova/virt/powervm/common.py:100
+#, python-format
+msgid "Running cmd (SSH-as-root): %s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:149
+msgid "File transfer to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/common.py:168
+#, python-format
+msgid "ftp GET %(remote_path)s to: %(local_path)s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:174
+msgid "File transfer from PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:125
+msgid "In get_host_ip_addr"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:128
+#, python-format
+msgid "Attempting to resolve %s"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:130
+#, python-format
+msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:171
+#, python-format
+msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:304
+#, python-format
+msgid "Unrecognized root disk information: %s"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:21
+msgid "Connection to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:25
+#, python-format
+msgid "File '%(file_path)s' transfer to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:29
+#, python-format
+msgid "FTP %(ftp_cmd)s from %(source_path)s to %(dest_path)s failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:33
+#, python-format
+msgid "LPAR instance '%(instance_name)s' could not be found"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:37
+#, python-format
+msgid "LPAR instance '%(instance_name)s' creation failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:41
+msgid "No space left on any volume group"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:49
+#, python-format
+msgid "Operation '%(operation)s' on LPAR '%(instance_name)s' timed out"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:54
+msgid "Image creation failed on PowerVM"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:58
+#, python-format
+msgid ""
+"Insufficient free memory on PowerVM system to spawn instance "
+"'%(instance_name)s'"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:63
+#, python-format
+msgid ""
+"Insufficient available CPUs on PowerVM system to spawn instance "
+"'%(instance_name)s'"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:68
+#, python-format
+msgid "PowerVM LPAR instance '%(instance_name)s' cleanup failed"
+msgstr ""
+
+#: nova/virt/powervm/lpar.py:55
+#, python-format
+msgid ""
+"Encountered unknown LPAR attribute: %s\n"
+"Continuing without storing"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:98
+#, python-format
+msgid "LPAR instance '%s' not found"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:186
+#, python-format
+msgid "PowerVM image creation failed: %s"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:200
+#, python-format
+msgid "Creating LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:202
+#, python-format
+msgid "LPAR instance '%s' creation failed"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:208
+#, python-format
+msgid "Activating the LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:225
+#, python-format
+msgid "Instance '%s' failed to boot"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:237
+msgid "Error while attempting to clean up failed instance launch."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:241
+#, python-format
+msgid "Instance spawned in %s seconds"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:252
+#, python-format
+msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:271
+#, python-format
+msgid "Stopping instance %s for snapshot."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:294
+#, python-format
+msgid "Shutting down the instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:299
+#, python-format
+msgid "Deleting the LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:311
+msgid "PowerVM instance cleanup failed"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
+msgid "Not enough free memory in the host"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
+msgid "Insufficient available CPU on PowerVM"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:138
+msgid ""
+"Must specify vmwareapi_host_ip,vmwareapi_host_username and "
+"vmwareapi_host_password to usecompute_driver=vmwareapi.VMwareESXDriver or"
+" vmwareapi.VMwareVCDriver"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:350
+#, python-format
+msgid "VMware Cluster %s is not found"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:453
+#, python-format
+msgid "In vmwareapi:_create_session, got this exception: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:536
+#, python-format
+msgid "In vmwareapi:_call_method, got this exception: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:572
+#, python-format
+msgid "Task [%(task_name)s] %(task_ref)s status: success"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:577
+#, python-format
+msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:581
+#, python-format
+msgid "In vmwareapi:_poll_task, Got this error %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:93
+#, python-format
+msgid "Error(s) %s occurred in the call to RetrieveProperties"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
+#, python-format
+msgid "%(text)s: _db_content => %(content)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:140
+#, python-format
+msgid "Property %(attr)s not set for the managed object %(name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:540
+msgid "There is no VM registered"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
+#, python-format
+msgid "Virtual Machine with ref %s is not there"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:605
+#, python-format
+msgid "Logging out a session that is invalid or already logged out: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:620
+msgid "Session is faulty"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:623
+msgid "Session Invalid"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:716
+msgid "No Virtual Machine has been registered yet"
+msgstr ""
+
+#: nova/virt/vmwareapi/host.py:40
+#, python-format
+msgid "%(action)s %(host)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/host.py:64
+#, python-format
+msgid "Set maintenance mod on %(host)s to %(mode)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:118
+#, python-format
+msgid "Glance image %s is in killed state"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:126
+#, python-format
+msgid "Glance image %(image_id)s is in unknown state - %(state)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:135
+msgid ""
+"ESX SOAP server returned an empty port group for the host system in its "
+"response"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:161
+#, python-format
+msgid "Creating Port Group with name %s on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:175
+#, python-format
+msgid "Created Port Group with name %s on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/read_write_util.py:145
+#, python-format
+msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:84
+msgid "Unable to import suds."
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:169
+#, python-format
+msgid "No such SOAP method '%s' provided by VI SDK"
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:174
+#, python-format
+msgid "httplib error in %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:181
+#, python-format
+msgid "Socket error in %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:186
+#, python-format
+msgid "Type error in  %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:190
+#, python-format
+msgid "Exception in %s "
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:92
+msgid "Getting list of instances"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:108
+#, python-format
+msgid "Got total of %s instances"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:199
+msgid "Creating VM on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:207
+msgid "Created VM on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:231
+#, python-format
+msgid ""
+"Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
+"type %(adapter_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:250
+#, python-format
+msgid ""
+"Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
+"%(disk_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:259
+#, python-format
+msgid ""
+"Deleting the file %(vmdk_path)s on the ESX host localstore "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:273
+#, python-format
+msgid ""
+"Deleted the file %(vmdk_path)s on the ESX host local store "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:281
+#, python-format
+msgid ""
+"Downloading image file data %(image_ref)s to the ESX data store "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:301
+#, python-format
+msgid ""
+"Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
+"ESX data store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:315
+#, python-format
+msgid ""
+"Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
+" %(adapter_type)s on the ESX host local store %(data_store_name)s to disk"
+" type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:336
+#, python-format
+msgid ""
+"Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
+"%(disk_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:415
+msgid "Powering on the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:421
+msgid "Powered on the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:464
+msgid "Creating Snapshot of the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:474
+msgid "Created Snapshot of the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:519
+msgid "Copying disk data before snapshot of the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:532
+msgid "Copied disk data before snapshot of the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:541
+#, python-format
+msgid "Uploading image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:555
+#, python-format
+msgid "Uploaded image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:568
+#, python-format
+msgid "Deleting temporary vmdk file %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:577
+#, python-format
+msgid "Deleted temporary vmdk file %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:606
+msgid "instance is not powered on"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:613
+msgid "Rebooting guest OS of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:616
+msgid "Rebooted guest OS of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:618
+msgid "Doing hard reboot of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:622
+msgid "Did hard reboot of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
+msgid "Destroying the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
+msgid "Destroyed the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:641
+#, python-format
+msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
+msgid "Powering off the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
+msgid "Powered off the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:684
+msgid "Unregistering the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:687
+msgid "Unregistered the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:689
+#, python-format
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while un-registering the "
+"VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:702
+#, python-format
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:714
+#, python-format
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:719
+#, python-format
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while deleting the VM "
+"contents from the disk: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:727
+msgid "pause not supported for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:731
+msgid "unpause not supported for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:742
+msgid "Suspending the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:746
+msgid "Suspended the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:749
+msgid "instance is powered off and cannot be suspended."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:752
+msgid "VM was already in suspended state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:762
+msgid "Resuming the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:767
+msgid "Resumed the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:769
+msgid "instance is not in a suspended state"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:829
+msgid "instance is suspended and cannot be powered off."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:832
+msgid "VM was already in powered off state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:843
+msgid "VM was already in powered on state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:847
+msgid "Powering on the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:852
+msgid "Powered on the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:872
+#, python-format
+msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:901
+#, python-format
+msgid "Renaming the VM to %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:907
+#, python-format
+msgid "Renamed the VM to %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:922
+#, python-format
+msgid "Cloning VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:930
+#, python-format
+msgid "Cloned VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:943
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:954
+#, python-format
+msgid ""
+"In vmwareapi:vmops:confirm_migration, got this exception while destroying"
+" the VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:970
+#, python-format
+msgid "Renaming the VM from %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:976
+#, python-format
+msgid "Renamed the VM from %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1001
+#, python-format
+msgid "Migrating VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1013
+#, python-format
+msgid "Migrated VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
+#, python-format
+msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1027
+#, python-format
+msgid "Automatically hard rebooting %d"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1061
+msgid "get_diagnostics not implemented for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1138
+msgid "Reconfiguring VM instance to set the machine id"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1144
+msgid "Reconfigured VM instance to set the machine id"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1156
+#, python-format
+msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1163
+#, python-format
+msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1256
+#, python-format
+msgid "Creating directory with path %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1262
+#, python-format
+msgid "Created directory with path %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:92
+#, python-format
+msgid "Downloading image %s from glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:108
+#, python-format
+msgid "Downloaded image %s from glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:114
+#, python-format
+msgid "Uploading image %s to the Glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:140
+#, python-format
+msgid "Uploaded image %s to the Glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:151
+#, python-format
+msgid "Getting image size for the image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:156
+#, python-format
+msgid "Got image size of %(size)s for the image %(image)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:163
+#, python-format
+msgid "Rescanning HBA %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:166
+#, python-format
+msgid "Rescanned HBA %s "
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:178 nova/virt/xenapi/volume_utils.py:267
+#, python-format
+msgid "Mountpoint cannot be translated: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:57
+#, python-format
+msgid ""
+"Reconfiguring VM instance %(instance_name)s to attach disk %(vmdk_path)s "
+"or device %(device_name)s with type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:65
+#, python-format
+msgid ""
+"Reconfigured VM instance %(instance_name)s to attach disk %(vmdk_path)s "
+"or device %(device_name)s with type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:77
+#, python-format
+msgid "Reconfiguring VM instance %(instance_name)s to detach disk %(disk_key)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:84
+#, python-format
+msgid "Reconfigured VM instance %(instance_name)s to detach disk %(disk_key)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:91
+#, python-format
+msgid "Discovering iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:96
+msgid "Storage target found. No need to discover"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:104
+#, python-format
+msgid "Discovered iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:107
+#, python-format
+msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:127
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:138 nova/virt/vmwareapi/volumeops.py:177
+msgid "Unable to find iSCSI Target"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
+#, python-format
+msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
+#, python-format
+msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:185
+msgid "Unable to find volume"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
+#, python-format
+msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
+#, python-format
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
+#, python-format
+msgid ""
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
+#, python-format
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:122
+#, python-format
+msgid ""
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:129
+#, python-format
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:155
+msgid "Querying agent version"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:174
+#, python-format
+msgid "Updating agent to %s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:183
+#, python-format
+msgid "Unable to update the agent due to: %(exc)s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:215
+msgid "Setting admin password"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:231
+msgid "Skipping setting of ssh key for Windows."
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:247
+#, python-format
+msgid "Injecting file path: %r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:257
+msgid "Resetting network"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:279
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:287
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:291
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:305
+msgid "Invalid 'agent_present' value. Falling back to the default."
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:358
+#, python-format
+msgid "OpenSSL error: %s"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:134
+msgid ""
+"Must specify xenapi_connection_url, xenapi_connection_username "
+"(optionally), and xenapi_connection_password to use "
+"compute_driver=xenapi.XenAPIDriver"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:161
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:349
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:572
+msgid "Host startup on XenServer is not supported."
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:633
+msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:673
+msgid "Host is member of a pool, but DB says otherwise"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
+#, python-format
+msgid "Got exception: %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
+msgid "Raising NotImplemented"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:714
+#, python-format
+msgid "xenapi.fake does not have an implementation for %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:747
+#, python-format
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:753
+#, python-format
+msgid "Calling getter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:756
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:818
+#, python-format
+msgid ""
+"xenapi.fake does not have an implementation for %s or it has been called "
+"with the wrong number of arguments"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:70
+#, python-format
+msgid ""
+"Instance %(name)s running on %(host)s could not be found in the database:"
+" assuming it is a worker VM and skip ping migration to a new host"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:82
+#, python-format
+msgid "Aggregate for host %(host)s count not be found."
+msgstr ""
+
+#: nova/virt/xenapi/host.py:101
+#, python-format
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:185
+#, python-format
+msgid "Failed to extract instance support from %s"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:202
+msgid "Unable to get updated status"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:205
+#, python-format
+msgid "The call to %(method)s returned an error: %(e)s."
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:29
+#, python-format
+msgid "Found non-unique network for name_label %s"
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:47
+#, python-format
+msgid "Found non-unique network for bridge %s"
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:49
+#, python-format
+msgid "Found no network for bridge %s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:70
+#, python-format
+msgid ""
+"Aggregate %(aggregate_id)s: unrecoverable state during operation on "
+"%(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:158
+#, python-format
+msgid "Unable to eject %s from the pool; pool not empty"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:175
+#, python-format
+msgid "Unable to eject %s from the pool; No master found"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:192
+#, python-format
+msgid "Pool-Join failed: %s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:195
+#, python-format
+msgid "Unable to join %s in the pool"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:211
+#, python-format
+msgid "Pool-eject failed: %s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:223
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:234
+#, python-format
+msgid "Pool-set_name_label failed: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vif.py:101
+#, python-format
+msgid "Found no PIF for device %s"
+msgstr ""
+
+#: nova/virt/xenapi/vif.py:120
+#, python-format
+msgid ""
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"Expected %(vlan_num)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:275
+msgid "Created VM"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:287
+msgid "VM destroyed"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:292 nova/virt/xenapi/vm_utils.py:307
+msgid "VM already halted, skipping shutdown..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:296
+msgid "Shutting down VM (cleanly)"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+msgid "Shutting down VM (hard)"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:349
+#, python-format
+msgid "VBD not found in instance %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:366
+#, python-format
+msgid "VBD %s already detached"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:369
+#, python-format
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:376
+#, python-format
+msgid "Unable to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:381
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:392
+#, python-format
+msgid "Unable to destroy VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:414
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:418
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:445
+#, python-format
+msgid "Unable to destroy VDI %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:472
+#, python-format
+msgid ""
+"Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
+" on %(sr_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:488
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:513
+#, python-format
+msgid "block device info: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:599
+#, python-format
+msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:645
+#, python-format
+msgid "No primary VDI found for %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:657
+msgid "Starting snapshot for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:707
+#, python-format
+msgid "Destroying cached VDI '%(vdi_uuid)s'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
+#, python-format
+msgid ""
+"Fast cloning is only supported on default local SR of type ext. SR on "
+"this system was found to be of type %s. Ignoring the cow flag."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1028
+#, python-format
+msgid "Unrecognized cache_images value '%s', defaulting to True"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1062
+#, python-format
+msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1075
+#, python-format
+msgid ""
+"download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
+"params: %(params)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1089
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1124
+#, python-format
+msgid "Invalid value '%s' for xenapi_torrent_images"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1208
+#, python-format
+msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1226
+#, python-format
+msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1250
+#, python-format
+msgid "Fetching image %(image_id)s, type %(image_type_str)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1264
+#, python-format
+msgid "Size for image %(image_id)s: %(virtual_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1274
+#, python-format
+msgid ""
+"Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
+"bytes"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1294
+#, python-format
+msgid "Copying VDI %s to /boot/guest on dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1308
+#, python-format
+msgid "Kernel/Ramdisk VDI %s destroyed"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1317
+msgid "Failed to fetch glance image"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1358
+#, python-format
+msgid "Detected %(image_type_str)s format for image %(image_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1389
+#, python-format
+msgid "Looking up vdi %s for PV kernel"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1407
+#, python-format
+msgid ""
+"Image format is None: trying to determine PV status using pygrub; if "
+"instance with vdi %s does not boot correctly, try with image metadata."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1413
+#, python-format
+msgid "Unknown image format %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1444
+#, python-format
+msgid "VDI %s is still available"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1547
+#, python-format
+msgid "Unable to parse rrd of %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1575
+#, python-format
+msgid "Re-scanning SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1603
+#, python-format
+msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1621
+msgid ""
+"XenAPI is unable to find a Storage Repository to install guest instances "
+"on. Please check your configuration and/or configure the flag "
+"'sr_matching_filter'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1634
+msgid "Cannot find SR of content-type ISO"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1642
+#, python-format
+msgid "ISO: looking at SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1644
+msgid "ISO: not iso content"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1647
+msgid "ISO: iso content_type, no 'i18n-key' key"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1650
+msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1654
+msgid "ISO: SR MATCHing our criteria"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1656
+msgid "ISO: ISO, looking to see if it is host local"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1659
+#, python-format
+msgid "ISO: PBD %s disappeared"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1662
+#, python-format
+msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1665
+msgid "ISO: SR with local PBD"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1687
+#, python-format
+msgid ""
+"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
+"%(server)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1704
+#, python-format
+msgid "Unable to obtain RRD XML updates with server details: %s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1758
+#, python-format
+msgid "Invalid statistics data from Xenserver: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1818
+#, python-format
+msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1906
+#, python-format
+msgid ""
+"Parent %(parent_uuid)s doesn't match original parent "
+"%(original_parent_uuid)s, waiting for coalesce..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1918
+#, python-format
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1953
+#, python-format
+msgid "Timeout waiting for device %s to be created"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1973
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1986
+#, python-format
+msgid "Plugging VBD %s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1989
+#, python-format
+msgid "Plugging VBD %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1991
+#, python-format
+msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1995
+#, python-format
+msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2001
+#, python-format
+msgid "Destroying VBD for VDI %s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2009
+#, python-format
+msgid "Destroying VBD for VDI %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2036
+#, python-format
+msgid "Running pygrub against %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2044
+#, python-format
+msgid "Found Xen kernel %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2046
+msgid "No Xen kernel found.  Booting HVM."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2048
+msgid ""
+"Error while executing pygrub! Please, ensure the binary is installed "
+"correctly, and available in your PATH; on some Linux distros, pygrub may "
+"be installed in /usr/lib/xen-X.Y/bin/pygrub. Attempting to boot in HVM "
+"mode."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2065
+msgid "Partitions:"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2071
+#, python-format
+msgid "  %(num)s: %(ptype)s %(size)d sectors"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2097
+#, python-format
+msgid ""
+"Writing partition table %(primary_first)d %(primary_last)d to "
+"%(dev_path)s..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2112
+#, python-format
+msgid "Writing partition table %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2153
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2196
+#, python-format
+msgid ""
+"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
+"virtual_size=%(virtual_size)d block_size=%(block_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2232
+#, python-format
+msgid ""
+"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
+"reduction in size"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2285
+msgid "Manipulating interface files directly"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2294
+#, python-format
+msgid "Failed to mount filesystem (expected for non-linux instances): %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2407
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
+#, python-format
+msgid "Updating progress to %d"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:175
+#, python-format
+msgid "Importing image upload handler: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:190
+msgid "Error: Agent is disabled"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:309
+msgid "Starting instance"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:395
+msgid "Removing kernel/ramdisk files from dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:468
+#, python-format
+msgid "Block device information present: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:499
+msgid "Failed to spawn, rolling back"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:594
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:640
+msgid "Starting VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:646
+msgid "Waiting for instance state to become running"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:660
+#, python-format
+msgid ""
+"Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
+"%(version)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:663
+#, python-format
+msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:674
+#, python-format
+msgid "Instance agent version: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:705
+msgid "Setting VCPU weight"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:716
+#, python-format
+msgid "Could not find VM with name %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:774
+msgid "Finished snapshot and upload for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:778
+#, python-format
+msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:787
+msgid "Failed to transfer vhd to new host"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:813
+msgid "VM was already shutdown."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:817
+msgid "Clean shutdown did not complete successfully, trying hard shutdown."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:991
+#, python-format
+msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:998
+msgid "Resize complete"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1043
+msgid "Starting halted instance found during reboot"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1049
+msgid ""
+"Reboot failed due to bad volumes, detaching bad volumes and starting "
+"halted instance"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1151
+msgid "Unable to find root VBD/VDI for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1155
+msgid "Destroying VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1182
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1189
+msgid "instance has a kernel or ramdisk but not both"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1196
+msgid "kernel/ramdisk files removed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1223
+msgid "Destroying VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1252
+msgid "VM is not present, skipping destroy..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1303
+#, python-format
+msgid "Instance is already in Rescue Mode: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1337
+msgid "VM is not present, skipping soft delete..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1390
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1540
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1562
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1574
+#, python-format
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1603
+msgid "Injecting hostname to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1707
+#, python-format
+msgid "Destination host:%s must be in the same aggregate as the source server"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1728
+msgid "No suitable network for migrate"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1740
+msgid "Migrate Receive failed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1814
+msgid "XAPI supporting relax-xsm-sr-check=true requried"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1825
+msgid "VM.assert_can_migrate failed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1878
+msgid "Migrate Send failed"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:51
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:61
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:68
+msgid "Creating PBD for SR"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:71
+msgid "Plugging SR"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:82
+msgid "Forgetting SR..."
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:104
+#, python-format
+msgid "Unable to find SR from VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:121
+#, python-format
+msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:129
+#, python-format
+msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:153
+#, python-format
+msgid "Unable to introduce VDI on SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:161
+#, python-format
+msgid "Unable to get record of VDI %s on"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:183
+#, python-format
+msgid "Unable to introduce VDI for SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:193
+msgid "Cannot purge SR with referenced VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
+#, python-format
+msgid "Unable to obtain target information %s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:47
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
+
+#: nova/virt/xenapi/imageupload/glance.py:69
+#, python-format
+msgid ""
+"Asking xapi to upload to glance %(vdi_uuids)s as ID %(image_id)s glance "
+"server: %(glance_host)s:%(glance_port)d attempt "
+"%(attempt_num)d/%(max_attempts)d"
+msgstr ""
+
+#: nova/virt/xenapi/imageupload/glance.py:87
+#, python-format
+msgid "upload_vhd failed: %r"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:95 nova/vnc/xvp_proxy.py:100
+#, python-format
+msgid "Error in handshake: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:115
+#, python-format
+msgid "Invalid request: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:135
+#, python-format
+msgid "Request: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:138
+#, python-format
+msgid "Request made with missing token: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:148
+#, python-format
+msgid "Request made with invalid token: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:155
+#, python-format
+msgid "Unexpected error: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:175
+#, python-format
+msgid "Starting nova-xvpvncproxy node (version %s)"
+msgstr ""
+
+#: nova/volume/cinder.py:98
+#, python-format
+msgid "Cinderclient connection created using URL: %s"
+msgstr ""
+
+#: nova/volume/cinder.py:229
+msgid "status must be 'in-use'"
+msgstr ""
+
+#: nova/volume/cinder.py:235
+msgid "status must be 'available'"
+msgstr ""
+
diff --git a/nova/locale/sw_KE/LC_MESSAGES/nova.po b/nova/locale/sw_KE/LC_MESSAGES/nova.po
index 4f0369b84..2be2088bf 100644
--- a/nova/locale/sw_KE/LC_MESSAGES/nova.po
+++ b/nova/locale/sw_KE/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Swahili (Kenya) "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 9db622e16..7e1a78c01 100644
--- a/nova/locale/tl/LC_MESSAGES/nova.po
+++ b/nova/locale/tl/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Tagalog <tl@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -662,8 +662,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -971,7 +972,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1195,180 +1196,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1456,67 +1462,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1879,11 +1900,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2347,17 +2363,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2365,6 +2384,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2389,6 +2410,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2402,14 +2424,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2443,9 +2465,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2579,111 +2601,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2692,22 +2718,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2789,6 +2815,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3016,14 +3043,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3484,97 +3515,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3665,6 +3709,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3680,6 +3758,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr "natanggap %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index f5d64a34f..8e4eb6c74 100644
--- a/nova/locale/tr/LC_MESSAGES/nova.po
+++ b/nova/locale/tr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2011-12-14 18:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -662,8 +662,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -971,7 +972,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1195,180 +1196,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1456,67 +1462,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1879,11 +1900,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2347,17 +2363,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2365,6 +2384,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2389,6 +2410,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2402,14 +2424,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2443,9 +2465,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2579,111 +2601,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2692,22 +2718,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2789,6 +2815,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3016,14 +3043,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3484,97 +3515,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3665,6 +3709,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3680,6 +3758,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4072,205 +4165,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4360,657 +4453,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5130,12 +5243,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5258,34 +5371,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5295,7 +5408,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5637,42 +5750,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5833,7 +5946,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6707,7 +6820,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6818,11 +6931,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6833,6 +6941,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6872,10 +6985,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6923,13 +7049,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7114,61 +7245,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7288,7 +7419,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8118,7 +8249,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8470,12 +8601,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8808,100 +8939,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8909,76 +9040,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8986,50 +9132,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9039,67 +9185,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9319,47 +9470,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9367,7 +9519,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9375,7 +9527,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9383,7 +9535,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10745,228 +10897,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10974,58 +11126,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11372,3 +11524,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index 047777852..5e106e7a9 100644
--- a/nova/locale/tr_TR/LC_MESSAGES/nova.po
+++ b/nova/locale/tr_TR/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-02-02 18:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -195,7 +195,7 @@ msgstr "Geçersiz giriş yapıldı"
 msgid "Invalid volume"
 msgstr "Geçersiz bölüm"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -678,8 +678,9 @@ msgstr "Hiç değişken IP yok."
 msgid "Interface %(interface)s not found."
 msgstr "%(interface)s arayüzü bulunamadı."
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -999,7 +1000,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1226,180 +1227,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "%(user_id)s kullanıcısı için %(name)s anahtar çifti bulunamadı"
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "%(name)s örneği zaten var."
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1488,67 +1494,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Yerel adres bağlantısı bulunamadı.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Geçersiz backend: %s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Geçersiz server_string: %s"
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "Zaman Fonksiyonu: %(name)s %(total_time).2f saniye sürdü"
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "%s güvenlik grubu string veya unicode değil"
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1914,11 +1935,6 @@ msgstr "Adresi kes %s"
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "İmaj müsait olmak zorunda"
@@ -2387,17 +2403,20 @@ msgstr "alt sınıflar yapıcı() oluşturmak zorunda!"
 msgid "Initializing extension manager."
 msgstr "Genişletme yöneticisi başlatılıyor"
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2405,6 +2424,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr "İmaj bulunamadı"
 
@@ -2429,6 +2450,7 @@ msgid "Invalid metadata key"
 msgstr "Geçersiz özellik anahtarı"
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2442,14 +2464,14 @@ msgstr "Örnek mevcut değil"
 msgid "Instance is not a member of specified network"
 msgstr "Örnek belirlenmiş ağın bir üyesi değil"
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr "Bu istek sayı limitlidir."
 
@@ -2483,9 +2505,9 @@ msgstr "%(flavor_id)s örnek türü bulunamadı."
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2619,120 +2641,124 @@ msgstr "İstenilen imaj dosyası bulunamadı"
 msgid "Invalid key_name provided."
 msgstr "Geçersiz anahtar adı verildi."
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "%s için kişisel içerik çözümlenemedi"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr "Örnek tekrar boyutlandırılacak şekilde ayarlanmadı."
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Önyükleme için argüman türü HARD veya SOFT değil"
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr "Önyükleme için tür argümanı eksik"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr "İstenilen örnek türü konumlandırılamıyor."
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "İmaj referans özelliği eksik"
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr "Geçersiz imaj referansı verildi."
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "Örnek türü referans özelliği eksik"
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr "Belirlenmiş bir yönetici parolası yok"
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr "Geçersiz yönetici parolası"
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Çözümlenemeyen metadata anahtar/değer çifti."
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 "Yeniden boyutlandırma isteği geçersiz örnek türü referansı özelliğine "
 "sahip."
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 "Yeniden boyutlandırma isteği geçersiz örnek türü referansı özelliği "
 "gerektirir."
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2741,22 +2767,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr "Geçersiz istek gövdesi"
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr "İstekte bulunulan imaj referansı çözümlenemedi."
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr "Yeniden kurulum için imaj dosyası bulunamadı."
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr "createImage varlığının isim özelliğine ihtiyacı var"
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
@@ -2839,6 +2865,7 @@ msgstr "yedekOluşturma 'dönüşme' özelliği tamsayı olmak zorunda"
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr "Örnek bulunamadı"
 
@@ -3076,14 +3103,18 @@ msgstr "Kural (%s) bulunamadı"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3553,98 +3584,111 @@ msgstr "Genişletme fabrikası çağırılıyor %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "%(ext_factory)s uzantısı yüklemede hata: %(exc)s"
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3735,6 +3779,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3750,6 +3828,21 @@ msgstr "eleman çocuk değil"
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4153,76 +4246,76 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "%(instance_type_id)s örnek türü bulunamadı"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4231,131 +4324,131 @@ msgstr ""
 "Eski örnek türü %(current_instance_type_name)s, yeni örnek türü "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Anahtar çifti adı 1-255 karakter arası uzunluğunda olmak zorunda"
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "%s güvenlik grubu string veya unicode değil"
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "%s güvenlik grubu boş bırakılamaz."
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "%s güvenlik grubu 255 karakterden fazla olmamalıdır."
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "%s güvenlik grubunu oluşturunuz"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "%s güvenlik grubu zaten var"
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Geçersiz güncelleme ayarı: '%s'"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Kural (%s) bulunamadı"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Yetkilendirilmiş %s güvenlik grubu girişi"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "%s güvenlik grubu girişini iptal et"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
@@ -4445,581 +4538,601 @@ msgstr "Veritabanı hatası: %s"
 msgid "Instance type %s not found for deletion"
 msgstr "Silme işlemi için %s örnek türü bulunamadı"
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Mevcut durum %(drv_state)s, veritabanındaki durum %(db_state)s."
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Misafir sistem sürücüsü güvenlik duvarı kurallarını desteklemiyor"
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr "Durum kontrol ediliyor"
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "%s blok aygıt haritalandırması ayarlanıyor"
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr "Örnek başlatılıyor.."
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
-msgstr "Ağ kurulumundaki örnek başarısız"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
+msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Örnek ağ_bilgisi: |%s|"
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr "Örnek blok aygıtı kurulumu hatalı"
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s örneği"
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "DiskBulunamadı yok sayılıyor: %s"
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "Blok cihazı haritalandırması kapatılıyor %s"
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Birimi ayır %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "%(num_images)d tane imaj bulundu(dönüş: %(rotation)d)"
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Ä°maj siliniyor %s"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Yönetici parolası oluşturmada hata. %s örneği çalışmıyor."
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Örneğin hiç bölümü yok."
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "dedef kaynak ile aynı!"
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Konsol ekleniyor"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "%(mountpoint)s'de %(volume_id)s bölümü ön yükleniyor"
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "%(mountpoint)s'e %(volume_id)s bölümü bağlanıyor"
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "%(mp)s bağlama noktasındaki %(volume_id)s bölümü ayrılıyor"
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "%(mp)s bağlama noktasındaki %(volume_id)s bölümü ayrılıyor"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "Sunucu durumu güncelleniyor"
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5028,84 +5141,84 @@ msgstr ""
 "Veritabanında %(num_db_instances)s ve misafir sistemde "
 "%(num_vm_instances)s bulundu"
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr "Silinen örnek kurtarılıyor"
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Ä°maj siliniyor %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5226,12 +5339,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5357,34 +5470,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Tanınmayan silinmiş okuma değeri '%s'"
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "%s geçerli bir örnek ismidir"
@@ -5394,7 +5507,7 @@ msgstr "%s geçerli bir örnek ismidir"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5738,42 +5851,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "%d süreç numarası bozuldu, radvd tekrar başlatılıyor"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "%s VLAN arayüzü başlatılıyor "
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "%s köprüsü koruma altına alınıyor"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "%(vlan)s vlan ve %(bridge)s köprüsü koruma altına alınıyor"
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5935,7 +6048,7 @@ msgstr "sil: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "miras nw_info için v4 alt ağları gerekiyor"
 
@@ -6819,7 +6932,7 @@ msgstr "Başka bir işlem bulunamadı"
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6930,11 +7043,6 @@ msgstr "%s işlem ID'si için servis yok"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr "%(method)s zamanlaması başarısız: %(ex)s"
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6945,6 +7053,11 @@ msgstr "%(filename)s dosyası için zamanlayıcı seçenekleri başlatılamadı:
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6984,10 +7097,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "VCPU ayarlanamadı, CPU koleksiyonunun bozulduğu varsayılıyor"
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7035,13 +7161,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7229,62 +7360,62 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "Örnekler çalışıyor: %s"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Örnekleri sonlandırmanın ardından: %s"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "İçsel hata"
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Zorla öldürülen örneklerin ardından: %s"
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "Kimlik doğrulama hatası"
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7408,7 +7539,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8243,7 +8374,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8597,12 +8728,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "|%s| örneği için değişken IP tahsisi"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8939,100 +9070,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9040,76 +9171,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9117,21 +9263,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9140,29 +9286,29 @@ msgstr ""
 "Diğer hesaplama düğümlerini haberdar etmek için %s geçici dosyası "
 "oluşturuluyor. Düğümler aynı belleğe bağlanmalıdır."
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr "Blok göçü paylaşılan hafıza ile kullanılamaz."
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9177,7 +9323,7 @@ msgstr ""
 " \n"
 " Bkz: %(u)s"
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9186,62 +9332,67 @@ msgstr ""
 "Diğer hesaplama düğümlerini haberdar etmek için %s geçici dosyası "
 "oluşturuluyor. Düğümler aynı belleğe bağlanmalıdır."
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 "plug_vifs() %(cnt)d kez başarısız oldu. %(hostname)s için %(max_retry)d "
 "denemeye kadar tekrar deneniyor."
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9463,47 +9614,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "%(vlan)s vlan ve %(bridge)s köprüsü koruma altına alınıyor"
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "%s köprüsü koruma altına alınıyor"
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9511,7 +9663,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9519,7 +9671,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9527,7 +9679,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10892,230 +11044,230 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 "İmaj '%(image_id)s' boyut%(size_bytes)d izin verilen örnek  "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11123,58 +11275,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11527,3 +11679,18 @@ msgstr "İmaj müsait olmak zorunda"
 msgid "status must be 'available'"
 msgstr "İmaj müsait olmak zorunda"
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr "Ağ kurulumundaki örnek başarısız"
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr "%(method)s zamanlaması başarısız: %(ex)s"
+
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 977bbbc92..43f5717fc 100644
--- a/nova/locale/uk/LC_MESSAGES/nova.po
+++ b/nova/locale/uk/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1882,11 +1903,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2350,17 +2366,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2368,6 +2387,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2392,6 +2413,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2405,14 +2427,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2446,9 +2468,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2582,111 +2604,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2695,22 +2721,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2792,6 +2818,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3019,14 +3046,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3488,97 +3519,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3669,6 +3713,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3684,6 +3762,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4077,205 +4170,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4365,658 +4458,678 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5136,12 +5249,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5264,34 +5377,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5301,7 +5414,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5643,42 +5756,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5839,7 +5952,7 @@ msgstr "отримано %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6714,7 +6827,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6825,11 +6938,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6840,6 +6948,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6879,10 +6992,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6930,13 +7056,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7121,61 +7252,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7295,7 +7426,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8125,7 +8256,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8477,12 +8608,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8815,100 +8946,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8916,76 +9047,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8993,50 +9139,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9046,67 +9192,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9326,47 +9477,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9374,7 +9526,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9382,7 +9534,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9390,7 +9542,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10752,228 +10904,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10981,58 +11133,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11380,3 +11532,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/vi_VN/LC_MESSAGES/nova.po b/nova/locale/vi_VN/LC_MESSAGES/nova.po
index 2e5039173..26d61cee3 100644
--- a/nova/locale/vi_VN/LC_MESSAGES/nova.po
+++ b/nova/locale/vi_VN/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-13 19:22+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index a149afb73..d311ad68b 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-05-07 06:51+0000\n"
 "Last-Translator: Edward <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
@@ -196,7 +196,7 @@ msgstr "收到无效的输入"
 msgid "Invalid volume"
 msgstr "无效的�"
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -672,8 +672,9 @@ msgstr "没有浮动ip存在。"
 msgid "Interface %(interface)s not found."
 msgstr "接� %(interface)s没有找到。"
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -982,7 +983,7 @@ msgstr "实例类型 %(name)s 已�存在。"
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1212,181 +1213,186 @@ msgstr "没有找到实例 %(instance_id)s"
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "把� %(volume_id)s 附加到实例 %(instance_id)s 上�置在 %(device)s"
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "没有为项目 %(project_id)s 找到��。"
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "实例 %(instance_id)s �在救�模�。"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "实例 %(instance_id)s �在救�模�。"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "实例类型 %(name)s 已�存在。"
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "期望的对象类型：%s"
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1475,67 +1481,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr "回调中debug：%s"
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地�没有找到：%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的��：%s"
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "�正确的server_string：%s"
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "�务器�称�是字符串或者unicode"
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "密钥对�称长度必须在1到255个字符之间"
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1909,11 +1930,6 @@ msgstr "�消地� %s 的关�"
 msgid "Floating ip is not associated."
 msgstr "浮动ip %(address)s 没有被关�。"
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "镜�必须�用。"
@@ -2384,17 +2400,20 @@ msgstr "subclasses必须执行construct()!"
 msgid "Initializing extension manager."
 msgstr "正在�始化扩展管�员。"
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "用户 %s 的签�无效"
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "用户 %s 的签�无效"
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2402,6 +2421,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr "镜�没有找到。"
 
@@ -2426,6 +2447,7 @@ msgid "Invalid metadata key"
 msgstr "无效的元数�键"
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2439,14 +2461,14 @@ msgstr "实例�存在"
 msgid "Instance is not a member of specified network"
 msgstr "实例并�是指定网络的�员"
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr "�能有 %(value)s 个 %(verb)s 请求��给 %(uri)s �定是�一个 %(unit_string)s。"
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr "这个请求�到频率�制。"
 
@@ -2481,9 +2503,9 @@ msgstr "主机 %(host)s 没有找到。"
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2621,118 +2643,122 @@ msgstr "无法找到请求的镜�"
 msgid "Invalid key_name provided."
 msgstr "�供了无效的key_name。"
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "id�能是None"
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "id�能是None"
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr "实例还没有调整大�。"
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "��的�数'type'既�是HARD也�是SOFT"
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr "缺少��的�数'type'"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr "无法找到请求的类型。"
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "调整大�需�尺寸的改�。"
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 #, fuzzy
 msgid "Image that the instance was started with could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "%s 是一个正确的实例�称"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "缺少属性imageRef"
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr "�供了无效的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "缺少属性flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr "没有确定adminPass"
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr "无效的adminPass"
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "�新�动实例失败"
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr "无法解�元数�键/值对"
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "调整大�请求中的属性'flavorRef'无效。"
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "调整大�请求�求有属性'flavorRef'。"
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2741,22 +2767,22 @@ msgstr "调整大�请求�求有属性'flavorRef'。"
 msgid "Invalid request body"
 msgstr "无效的请求主体"
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr "无法解�请求中的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr "无法找到用��新创建的镜�"
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr "实体createImage需�属性name"
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
@@ -2839,6 +2865,7 @@ msgstr "createBackup的属性 'rotation'必须是整数"
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr "没有找到实例"
 
@@ -3077,15 +3104,19 @@ msgstr "�书 %(certificate_id)s 没有找到。"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 #, fuzzy
 msgid "Flavor not found."
 msgstr "没有找到�务器。"
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 #, fuzzy
 msgid "No request body"
 msgstr "没有请求主体"
@@ -3565,98 +3596,111 @@ msgstr "调用扩展工厂 %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "没有适用于消�的方法：%s"
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "没有适用于消�的方法：%s"
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, fuzzy, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr "正在删除基文件：%s"
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, fuzzy, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr "把“%(method)s�投放在主机 \"%(host)s\""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "没有为实例 %(instance_id)s 找到�。"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "没有为实例 %(instance_id)s 找到�。"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3747,6 +3791,40 @@ msgstr "�动VPN %s"
 msgid "Failed to load %s"
 msgstr "无法创建�"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3762,6 +3840,21 @@ msgstr "元素�是�节点"
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4173,214 +4266,214 @@ msgstr "安全组 %s �能比255个字符更长。"
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "无法附加�到实例 %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备�行 %s 个实例"
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "准备�试软删除实例 %s"
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "准备�试终止实例 %s"
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "准备�试�止实例 %s"
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "准备�试�动实例 %s"
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr "�索�件： %s"
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。�定在�移。"
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr "旧的实例类型 %(current_instance_type_name)s，新的实例类型 %(new_instance_type_name)s"
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "%(pid)s 已�超过��，试图�行 %(min_count)s 个实例"
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "准备�试终止实例 %s"
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "密钥对�称长度必须在1到255个字符之间"
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既�是字符串也�是unicode"
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s �能为空。"
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr "�数GroupName的值 (%s) 无效。长度超过了上�255。"
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "安全组 %s �能比255个字符更长。"
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已�存在"
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "无法销�VBD %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "无法销�VBD %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "安全组id应该是整数"
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "添加安全组规则：%r"
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授� %s 安全组入���"
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入���"
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr "安全组id应该是整数"
 
@@ -4472,518 +4565,538 @@ msgstr "数�库错误：%s"
 msgid "Instance type %s not found for deletion"
 msgstr "未找到�删除的实例类型 %s"
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "无法把实例 (%(instance_id)s) �移到当�主机 (%(host)s)。"
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "�新�动实例失败"
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "当�状�是 %(drv_state)s，数�库状�是 %(db_state)s。"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute���，实例正在��。"
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "虚拟机管�程�驱动�支�防�墙规则"
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管�程�驱动�支�防�墙规则"
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "�外的状��"
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr "正在检查状�"
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "数�库错误：%s"
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr "正在�动虚拟机"
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
-msgstr "实例网络设置失败"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
+msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr "实例�设备设置失败"
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s。把实例的 vm_state设置为ERROR"
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "正在�新创建实例 %s"
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "为� %s 创建快照"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "正在��虚拟机 %s"
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr "试图��一个没有�行的实例：%(instance_uuid)s (状�：%(state)s 预计：%(running)s)"
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "实例 %s：��"
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr "试图为一个没有�行的实例快照：%(instance_uuid)s (状�：%(state)s 预计：%(running)s)"
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜� (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮�出%d个备份"
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜� %s"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管�员密�失败。实例 %s 没有�行"
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 #, fuzzy
 msgid "Root password set"
 msgstr "实例 %s：Root密�已设置"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 #, fuzzy
 msgid "error setting admin password"
 msgstr "设置管�员密�出错"
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "数�库错误：%s"
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "实例 %s：�消救�"
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状�"
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "实例没有�。"
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "目标与��一样。"
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 #, fuzzy
 msgid "Pausing"
 msgstr "正在更新。"
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "实例 %s ：获�诊断"
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "�置网络"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "实例 %s：注入网络信�"
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "获�实例 %s 控制�输出"
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "实例 %s：正在获得VNC控制�"
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "实例 %s：正在获得VNC控制�"
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "� %(volume_id)s 正在 %(mountpoint)s 上�动"
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, fuzzy, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr "� %(volume_id)s 正在 %(mountpoint)s 上�动"
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "� %(volume_id)s 从挂载点 %(mp)s 分离"
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "从未知实例%s中分离�"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "实例 %s 的网络分�"
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "post_live_migration()已��动。"
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4991,171 +5104,171 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。�这个错误�以放心的忽略。"
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "�移��作�动"
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "为ip： %s获�元数�失败"
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr "�现 %(migration_count)d 个超过 %(confirm_window)d 秒未�确认的�移"
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 #, fuzzy
 msgid "In ERROR state"
 msgstr "节点处于未知的错误状�。"
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "更新主机状�"
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr "在数�库中找到 %(num_db_instances)s个实例，在虚拟机管�程�找到 %(num_vm_instances)s 个实例。"
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "实例未�动"
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "计算节点 %s 没有�务"
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状�"
@@ -5277,12 +5390,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
@@ -5410,34 +5523,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "无法识别的 read_deleted �值�%s“"
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "实例 %s：已救�"
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "实例 %s：已救�"
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "实例 %s：已救�"
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "实例 %s：已救�"
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "实例 %s：已救�"
@@ -5447,7 +5560,7 @@ msgstr "实例 %s：已救�"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5793,42 +5906,42 @@ msgstr "�掉进程 radvd 时抛出 %s"
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d 过期了，�新�动radvd"
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "无效的状�：'%s'"
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "正在开�VLAN接� %s"
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "��桥 %s"
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "��vlan %(vlan)s 和桥 %(bridge)s"
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "挂起实例失败"
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "��桥 %s"
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "��桥 %s"
@@ -5995,7 +6108,7 @@ msgstr "_delete: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "�留的网络信� nw_info �求使用 IPv4 �网"
 
@@ -6890,7 +7003,7 @@ msgstr "无法找到�一个计算节点"
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -7001,11 +7114,6 @@ msgstr "计算节点 %s 没有�务"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr "schedule_%(method)s 失败：%(ex)s"
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -7016,6 +7124,11 @@ msgstr "无法统计调度器的选项文件 %(filename)s：“%(e)s�"
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -7055,10 +7168,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "未设置 VCPUs；�设 CPU 集���了"
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -7106,13 +7232,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7298,7 +7429,7 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 #, fuzzy
 msgid ""
@@ -7306,55 +7437,55 @@ msgid ""
 "instances"
 msgstr "%(pid)s 已�超过��，试图�行 %(min_count)s 个实例"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr "正在�行的实例：%s"
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "终止实例之�：%s"
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制�死实例�：%s"
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "未知的guestmount错误"
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7480,7 +7611,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8323,7 +8454,7 @@ msgstr "实例代�版本：%s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "正在更新主机状�"
@@ -8689,12 +8820,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "为实例 |%s| 分�浮动IP"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "注入文件路径：'%s'"
@@ -9045,102 +9176,102 @@ msgstr "实例�功��。"
 msgid "Failed to soft reboot instance."
 msgstr "�新�动实例失败"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例�功生产。"
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr "实例�功��。"
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr "实例在�行"
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "实例�功生产。"
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "用户没有管�员��"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr "正在创建镜�"
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "将 %(injection)s 注入到镜� %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "忽略�镜� %(img_id)s  注入的数�的错误 (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9148,77 +9279,92 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代� %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr "无法得到CPU的数目，因为这个函数�是给这个平�执行的。这个错误�以被放心忽略。"
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(�支�getVersion)"
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "正在获�镜� %s 的大�"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9226,37 +9372,37 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr "创建tmpfile %s �通知其他的计算节点需�挂载相�的存储。"
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr "�存储�移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "�存储�移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9265,7 +9411,7 @@ msgstr ""
 "无法�移%(instance_id)s 到 %(dest)s 上：缺少�盘(主机:%(available)s <= "
 "实例:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9274,7 +9420,7 @@ msgstr ""
 "已�动实例的CPU信�：\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9289,71 +9435,76 @@ msgstr ""
 "\n"
 "�考 %(u)s"
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr "创建tmpfile %s �通知其他的计算节点需�挂载相�的存储。"
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() 失败%(cnt)d 次。最多�新�试 %(max_retry)d 次在主机 %(hostname)s。"
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代� %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "实例 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "实例 %s �功�行。"
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9577,48 +9728,49 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "�外错误：%s"
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "��vlan %(vlan)s 和桥 %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "��桥 %s"
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 #, fuzzy
 msgid "Failed while unplugging vif"
 msgstr "移除实例�%s“的虚拟网络设备时失败"
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9626,7 +9778,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9634,7 +9786,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9642,7 +9794,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -11064,229 +11216,229 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr "镜�大� %(size_bytes)d 超过instance_type所�许的�大 %(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "获�镜� %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "镜� %(image)s 的大�：%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr "内核/内存盘镜�太大：%(vdi_size)d 字节，最大 %(max_size)d 字节"
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "将VDI %s �制到dom0的/boot/guest下"
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "内核/内存盘 VDI %s 已销�"
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "实例 %s：获�Glance镜�失败"
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "检测到 %(image_type_str)s 格�，目标是镜� %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "为PV内核查询vdi %s"
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s �然�用"
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "�新扫�存储库 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "标记sr_matching_filter '%s' 没有�循格��求"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr "XenAPI无法找到安装客户实例的存储库。请检查你的�置或者�置标记'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr "无法找到content-type ISO的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr "ISO：�iso内容"
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO：iso content_type，没有 'i18n-key' 键"
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO：iso content_type，i18n-key的值�是 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: 存储库符�标准"
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, 正在查看是�是本地的主机"
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD匹�, 想� %(pbd_rec)s, 目�有 %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr "ISO：�有本地PBD的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr "无法为��务器详细信�的虚拟机 %(vm_uuid)s 获�RRD XML：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "�自Xenserver无效的统计数�：%s"
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s 有父 %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s �匹�，正在等待�并..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "等待设备 %s 创建超时"
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "�入VBD %s... "
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "�入VBD %s 完�。"
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s �入"
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s �入错误的设备，�新映射为 %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "正在销�VDI为 %s 的 VBD "
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "已�销�VDI为 %s 的 VBD"
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "对 %s �行pygrub"
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "找到Xen内核 %s"
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "没有找到Xen内核。正在�动HVM。"
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11294,58 +11446,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr "分区："
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "完�写入分区表 %s 。"
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr "直接�作接�文件"
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "挂载文件系统失败(期望的是�Linux实例)：%s"
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11714,3 +11866,18 @@ msgstr "状�必须�用"
 msgid "status must be 'available'"
 msgstr "状�必须�用"
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr "实例网络设置失败"
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr "schedule_%(method)s 失败：%(ex)s"
+
diff --git a/nova/locale/zh_HK/LC_MESSAGES/nova.po b/nova/locale/zh_HK/LC_MESSAGES/nova.po
index a2d47c43f..e845f4c91 100644
--- a/nova/locale/zh_HK/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_HK/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Hong Kong) "
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2348,17 +2364,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2366,6 +2385,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2390,6 +2411,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2403,14 +2425,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2444,9 +2466,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2580,111 +2602,115 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 msgid "Invalid instance image."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2693,22 +2719,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2790,6 +2816,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3017,14 +3044,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3485,97 +3516,110 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3666,6 +3710,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3681,6 +3759,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4073,205 +4166,205 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4361,657 +4454,677 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5131,12 +5244,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5259,34 +5372,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5296,7 +5409,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5638,42 +5751,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5834,7 +5947,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6708,7 +6821,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6819,11 +6932,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6834,6 +6942,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6873,10 +6986,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6924,13 +7050,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7115,61 +7246,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7289,7 +7420,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8119,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8471,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8809,100 +8940,100 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8910,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8987,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9040,67 +9186,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9320,47 +9471,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9376,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9384,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10746,228 +10898,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10975,58 +11127,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11373,3 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 584c784ea..0815cd648 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-26 19:37+0000\n"
+"POT-Creation-Date: 2013-06-28 19:37+0000\n"
 "PO-Revision-Date: 2012-03-07 02:00+0000\n"
 "Last-Translator: Charles Hsu <charles0126+openstack@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1341
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
@@ -663,8 +663,9 @@ msgstr ""
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:671
-msgid "Cannot disassociate auto assigined floating ip"
+#: nova/exception.py:671 nova/api/ec2/cloud.py:1307
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
 #: nova/exception.py:675
@@ -972,7 +973,7 @@ msgstr ""
 #: nova/exception.py:927
 #, python-format
 msgid ""
-"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"Flavor access already exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
@@ -1196,180 +1197,185 @@ msgstr ""
 
 #: nova/exception.py:1128
 #, python-format
+msgid "Invalid value for Config Drive option: %(option)s"
+msgstr ""
+
+#: nova/exception.py:1132
+#, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1133
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/exception.py:1142
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1150
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1152
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1156
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1165
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1166
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1170
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1175
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1183
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1187
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1192
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1202
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1207
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1211
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:1215
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:1220
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1231
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1235
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1239
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1243
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1247
+#: nova/exception.py:1251
 #, python-format
 msgid "Error during following call to agent: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1251
+#: nova/exception.py:1255
 #, python-format
 msgid "Unable to contact guest agent. The following call timed out: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1256
+#: nova/exception.py:1260
 #, python-format
 msgid "Agent does not support the call: %(method)s"
 msgstr ""
 
-#: nova/exception.py:1260
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1264
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1268
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1273
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1278
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1457,67 +1463,82 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:150
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:170
+#: nova/utils.py:178
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:362
+#, python-format
+msgid "Couldn't get IPv4 : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:379
+#, python-format
+msgid "IPv4 address is not found.: %s"
+msgstr ""
+
+#: nova/utils.py:382
+#, python-format
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
+msgstr ""
+
+#: nova/utils.py:397
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:400
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:439
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:525
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:554
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:696
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:750 nova/openstack/common/fileutils.py:64
+#: nova/utils.py:814 nova/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:872 nova/virt/configdrive.py:177
+#: nova/utils.py:936 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1032
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1036
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1041
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1880,11 +1901,6 @@ msgstr ""
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
 #: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
@@ -2349,17 +2365,20 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:107
+#: nova/api/openstack/compute/flavors.py:108
+#: nova/api/openstack/compute/plugins/v3/flavors.py:108
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:127
+#: nova/api/openstack/compute/flavors.py:128
+#: nova/api/openstack/compute/plugins/v3/flavors.py:128
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:134
+#: nova/api/openstack/compute/flavors.py:135
+#: nova/api/openstack/compute/plugins/v3/flavors.py:135
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2367,6 +2386,8 @@ msgstr ""
 #: nova/api/openstack/compute/image_metadata.py:36
 #: nova/api/openstack/compute/images.py:141
 #: nova/api/openstack/compute/images.py:157
+#: nova/api/openstack/compute/plugins/v3/images.py:141
+#: nova/api/openstack/compute/plugins/v3/images.py:157
 msgid "Image not found."
 msgstr ""
 
@@ -2391,6 +2412,7 @@ msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/images.py:162
+#: nova/api/openstack/compute/plugins/v3/images.py:162
 msgid "You are not allowed to delete the image."
 msgstr ""
 
@@ -2404,14 +2426,14 @@ msgstr ""
 msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:161
+#: nova/api/openstack/compute/limits.py:148
 #, python-format
 msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
 
-#: nova/api/openstack/compute/limits.py:288
+#: nova/api/openstack/compute/limits.py:276
 msgid "This request was rate-limited."
 msgstr ""
 
@@ -2445,9 +2467,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:576
 #: nova/api/openstack/compute/servers.py:745
-#: nova/api/openstack/compute/servers.py:1008
-#: nova/api/openstack/compute/servers.py:1116
-#: nova/api/openstack/compute/servers.py:1289
+#: nova/api/openstack/compute/servers.py:1011
+#: nova/api/openstack/compute/servers.py:1119
+#: nova/api/openstack/compute/servers.py:1292
 #: nova/api/openstack/compute/plugins/v3/servers.py:618
 #: nova/api/openstack/compute/plugins/v3/servers.py:785
 #: nova/api/openstack/compute/plugins/v3/servers.py:1090
@@ -2581,112 +2603,116 @@ msgstr ""
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:996
+#: nova/api/openstack/compute/servers.py:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:999
 #: nova/api/openstack/compute/plugins/v3/servers.py:1078
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1000
+#: nova/api/openstack/compute/servers.py:1003
 #: nova/api/openstack/compute/plugins/v3/servers.py:1082
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1026
-#: nova/api/openstack/compute/servers.py:1043
+#: nova/api/openstack/compute/servers.py:1029
+#: nova/api/openstack/compute/servers.py:1046
 #: nova/api/openstack/compute/plugins/v3/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1125
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1049
 #: nova/api/openstack/compute/plugins/v3/servers.py:1128
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1062
+#: nova/api/openstack/compute/servers.py:1065
 #: nova/api/openstack/compute/plugins/v3/servers.py:1144
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1066
+#: nova/api/openstack/compute/servers.py:1069
 #: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1091
 #: nova/api/openstack/compute/plugins/v3/servers.py:1170
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1094
 #: nova/api/openstack/compute/plugins/v3/servers.py:1173
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1100
 #: nova/api/openstack/compute/plugins/v3/servers.py:1179
 msgid "You are not authorized to access the image the instance was started with."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1104
 #: nova/api/openstack/compute/plugins/v3/servers.py:1183
 msgid "Image that the instance was started with could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1105
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "無效的快照(snapshot)"
 
-#: nova/api/openstack/compute/servers.py:1126
+#: nova/api/openstack/compute/servers.py:1129
 #: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1135
+#: nova/api/openstack/compute/servers.py:1138
 #: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1162
+#: nova/api/openstack/compute/servers.py:1165
 #: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1175
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1179
-#: nova/api/openstack/compute/servers.py:1388
+#: nova/api/openstack/compute/servers.py:1182
+#: nova/api/openstack/compute/servers.py:1391
 #: nova/api/openstack/compute/plugins/v3/servers.py:1267
 #: nova/api/openstack/compute/plugins/v3/servers.py:1476
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1185
+#: nova/api/openstack/compute/servers.py:1188
 #: nova/api/openstack/compute/plugins/v3/servers.py:1273
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1194
+#: nova/api/openstack/compute/servers.py:1197
 #: nova/api/openstack/compute/plugins/v3/servers.py:1282
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1207
+#: nova/api/openstack/compute/servers.py:1210
 #: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1210
+#: nova/api/openstack/compute/servers.py:1213
 #: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1228
+#: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
@@ -2695,22 +2721,22 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1234
+#: nova/api/openstack/compute/servers.py:1237
 #: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1295
+#: nova/api/openstack/compute/servers.py:1298
 #: nova/api/openstack/compute/plugins/v3/servers.py:1383
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1329
+#: nova/api/openstack/compute/servers.py:1332
 #: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1417
 #: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
@@ -2792,6 +2818,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:41
+#: nova/api/openstack/compute/plugins/v3/server_diagnostics.py:47
 msgid "Instance not found"
 msgstr ""
 
@@ -3022,14 +3049,18 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:76
 #: nova/api/openstack/compute/contrib/flavor_access.py:100
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:76
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:105
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavor_access.py:117
+#: nova/api/openstack/compute/plugins/v3/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -3490,98 +3521,111 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:204
+#: nova/cells/messaging.py:205
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#: nova/cells/messaging.py:361 nova/cells/messaging.py:369
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:380
+#: nova/cells/messaging.py:381
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:404
+#: nova/cells/messaging.py:405
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:431
+#: nova/cells/messaging.py:432
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:510
+#: nova/cells/messaging.py:511
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:530
+#: nova/cells/messaging.py:531
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:548
+#: nova/cells/messaging.py:549
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:664
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:686
+#: nova/cells/messaging.py:694
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:696
+#: nova/cells/messaging.py:704
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:821
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/cells/messaging.py:864
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/cells/messaging.py:879
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:893
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:914
+#: nova/cells/messaging.py:923
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1099
+#: nova/cells/messaging.py:1002
+#, python-format
+msgid "No match when trying to update BDM: %(bdm)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1162
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1119
+#: nova/cells/messaging.py:1182
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
 
+#: nova/cells/rpcapi.py:335
+msgid "Failed to notify cells of BDM update/create."
+msgstr ""
+
+#: nova/cells/rpcapi.py:351
+msgid "Failed to notify cells of BDM destroy."
+msgstr ""
+
 #: nova/cells/scheduler.py:128
 #, python-format
 msgid "Weighted cells: %(weighted_cells)s"
@@ -3672,6 +3716,40 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "找�到Volume %s"
 
+#: nova/cmd/baremetal_deploy_helper.py:180
+#, python-format
+msgid "parent device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:184
+#, python-format
+msgid "root device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:187
+#, python-format
+msgid "swap device '%s' not found"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:196
+msgid "Failed to detect root device UUID."
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:214
+#, python-format
+msgid "Cmd     : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:215
+#, python-format
+msgid "StdOut  : %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:216
+#, python-format
+msgid "StdErr  : %s"
+msgstr ""
+
 #: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
@@ -3687,6 +3765,21 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
+#: nova/cmd/baremetal_deploy_helper.py:278
+#, python-format
+msgid "post: environ=%s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:297
+#, python-format
+msgid "Deploy agent error message: %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:319
+#, python-format
+msgid "request is queued: node %(node_id)s, params %(params)s"
+msgstr ""
+
 #: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1255
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
@@ -4079,207 +4172,207 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:572
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/api.py:670
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:815
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:842
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1125
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "建立虛擬介�失敗"
 
-#: nova/compute/api.py:1261
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1277
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1321
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1346
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1397
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1413
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1485
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1722
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2060
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2069
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2117
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2256
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2441
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2555
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2577
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2581
+#: nova/compute/api.py:2578
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2826 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2830 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2915
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2918
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2926
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2950
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2953
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2960
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2979
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "找�到Volume %s"
 
-#: nova/compute/api.py:3039
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "找�到Volume %s"
 
-#: nova/compute/api.py:3044
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3052
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3055
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3132 nova/compute/api.py:3206
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3148
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3151
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3160
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3213
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4369,660 +4462,680 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:207
+#: nova/compute/manager.py:210
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:380
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:411
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:460
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:473
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:494
+#: nova/compute/manager.py:497
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:500
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:542
+#: nova/compute/manager.py:545
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:571
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:585
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:602
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:621
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:653
+#, python-format
+msgid ""
+"Event %s arrived for non-existent instance. The instance was probably "
+"deleted."
+msgstr ""
+
+#: nova/compute/manager.py:656
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:687
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:785
+#: nova/compute/manager.py:792
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:903
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:926
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:953 nova/compute/manager.py:2479
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:997
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1037
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1054
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1092
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1097
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1103
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1132
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1142
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1166
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1177
-msgid "Instance failed network setup"
+#: nova/compute/manager.py:1167
+#, python-format
+msgid ""
+"Treating negative config value (%(retries)s) for "
+"'network_allocate_retries' as 0."
 msgstr ""
 
-#: nova/compute/manager.py:1179
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1190
+#: nova/compute/manager.py:1188
+#, python-format
+msgid "Instance failed network setup after %(attempts)d attempt(s)"
+msgstr ""
+
+#: nova/compute/manager.py:1192
+#, python-format
+msgid "Instance failed network setup (attempt %(attempt)d of %(attempts)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1225
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1209
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1260
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1334
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1384
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1387
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1394
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1442
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
-#: nova/compute/manager.py:4239
+#: nova/compute/manager.py:1539 nova/compute/manager.py:2749
+#: nova/compute/manager.py:4274
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1668
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1689
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1772
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "無法�載 Volume %s"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1841
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1877
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1880
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1893
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1920
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1926
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1987
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1995
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:2000
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2035
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2057
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2064
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2112
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2082
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2102
+#: nova/compute/manager.py:2137
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2134
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2156
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2177
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2399
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2433
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2439
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2460
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2711
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2831
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2862
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2882
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2907
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2934
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3017
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3094
+#: nova/compute/manager.py:3129
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "�載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3125
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:3143
+#: nova/compute/manager.py:3178
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "�載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3237
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3390
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3418
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3473
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3475
+#: nova/compute/manager.py:3510
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3490
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3522
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3651
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3703
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3708
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3717
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3725
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3730
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3737
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3764
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3784
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3808
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3911
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3925
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3952
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
+#: nova/compute/manager.py:3994 nova/compute/manager.py:4043
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3995
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:4032
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
-#: nova/compute/manager.py:4083
+#: nova/compute/manager.py:4079 nova/compute/manager.py:4088
+#: nova/compute/manager.py:4118
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4064
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4070
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4092
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4100
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4113
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4140
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4185 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4190
+#: nova/compute/manager.py:4225
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4196
+#: nova/compute/manager.py:4231
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4203
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4230
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5142,12 +5255,12 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:114
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:289
+#: nova/conductor/manager.py:322
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5270,34 +5383,34 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:650
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:871
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1156 nova/db/sqlalchemy/api.py:1196
+#: nova/db/sqlalchemy/api.py:1155 nova/db/sqlalchemy/api.py:1195
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1333
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1426
+#: nova/db/sqlalchemy/api.py:1425
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1561
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
@@ -5307,7 +5420,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4448
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5649,42 +5762,42 @@ msgstr ""
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1285
+#: nova/network/linux_net.py:1297
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1288
+#: nova/network/linux_net.py:1300
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1406
+#: nova/network/linux_net.py:1418
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1452
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1476
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1512
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1737
+#: nova/network/linux_net.py:1749
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1745
+#: nova/network/linux_net.py:1757
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5846,7 +5959,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:382
+#: nova/network/model.py:383
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -6722,7 +6835,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
 msgid "Setting instance to %s state."
 msgstr ""
@@ -6833,11 +6946,6 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:218
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
 #: nova/scheduler/scheduler_options.py:71
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
@@ -6848,6 +6956,11 @@ msgstr ""
 msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
+#: nova/scheduler/utils.py:54
+#, python-format
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
+
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
 msgid "Group affinity: %(host)s in %(configured)s"
@@ -6887,10 +7000,23 @@ msgstr ""
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
 
-#: nova/scheduler/filters/core_filter.py:44
+#: nova/scheduler/filters/core_filter.py:50
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr ""
 
+#: nova/scheduler/filters/core_filter.py:93
+#: nova/scheduler/filters/ram_filter.py:94
+#, python-format
+msgid ""
+"%(num_values)d ratio values found, of which the minimum value will be "
+"used."
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:100
+#, python-format
+msgid "Could not decode cpu_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/disk_filter.py:47
 #, python-format
 msgid ""
@@ -6938,13 +7064,18 @@ msgid ""
 "to %(max_instances)s"
 msgstr ""
 
-#: nova/scheduler/filters/ram_filter.py:46
+#: nova/scheduler/filters/ram_filter.py:55
 #, python-format
 msgid ""
 "%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
 " %(usable_ram)s MB usable ram."
 msgstr ""
 
+#: nova/scheduler/filters/ram_filter.py:101
+#, python-format
+msgid "Could not decode ram_allocation_ratio: '%(e)s'"
+msgstr ""
+
 #: nova/scheduler/filters/retry_filter.py:41
 #, python-format
 msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
@@ -7129,61 +7260,61 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3531
+#: nova/tests/api/openstack/compute/test_servers.py:3504
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3536
+#: nova/tests/api/openstack/compute/test_servers.py:3509
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3541
+#: nova/tests/api/openstack/compute/test_servers.py:3514
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1137
-#: nova/tests/compute/test_compute.py:1155
-#: nova/tests/compute/test_compute.py:1206
-#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1239
 #: nova/tests/compute/test_compute.py:1257
-#: nova/tests/compute/test_compute.py:1304
-#: nova/tests/compute/test_compute.py:4158
+#: nova/tests/compute/test_compute.py:1308
+#: nova/tests/compute/test_compute.py:1333
+#: nova/tests/compute/test_compute.py:1359
+#: nova/tests/compute/test_compute.py:1406
+#: nova/tests/compute/test_compute.py:4260
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1143
-#: nova/tests/compute/test_compute.py:1178
-#: nova/tests/compute/test_compute.py:1221
 #: nova/tests/compute/test_compute.py:1245
-#: nova/tests/compute/test_compute.py:1275
+#: nova/tests/compute/test_compute.py:1280
+#: nova/tests/compute/test_compute.py:1323
+#: nova/tests/compute/test_compute.py:1347
+#: nova/tests/compute/test_compute.py:1377
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1847
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4169
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4680
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9579
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1808
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7303,7 +7434,7 @@ msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2183
+#: nova/virt/xenapi/vm_utils.py:2181
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
@@ -8138,7 +8269,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8490,12 +8621,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1937
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8829,101 +8960,101 @@ msgstr ""
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1399
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1447
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1593
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1604 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
+#: nova/virt/libvirt/driver.py:1658 nova/virt/libvirt/driver.py:1684
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1673 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "使用者並沒有管�者權力"
 
-#: nova/virt/libvirt/driver.py:1738
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1742
+#: nova/virt/libvirt/driver.py:1746
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
+#: nova/virt/libvirt/driver.py:1751 nova/virt/libvirt/driver.py:1756
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1823
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1924
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1977
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1993
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2049
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2055
+#: nova/virt/libvirt/driver.py:2059
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2059
+#: nova/virt/libvirt/driver.py:2063
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2079
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2403
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8931,76 +9062,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2420
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2438
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2459
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2513
+#, python-format
+msgid "An error occurred while trying to define a domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2522
+#, python-format
+msgid "An error occurred while trying to launch a defined domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2530
+#, python-format
+msgid "An error occurred while enabling hairpin mode on domain with xml: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2584 nova/virt/libvirt/driver.py:2775
+#: nova/virt/libvirt/driver.py:2801
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
+#: nova/virt/libvirt/driver.py:2666 nova/virt/libvirt/driver.py:2670
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2669
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2686
+#: nova/virt/libvirt/driver.py:2708
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2696
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2770
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2905
+#: nova/virt/libvirt/driver.py:2927
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "無法�載 Volume %s"
 
-#: nova/virt/libvirt/driver.py:2918
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9008,50 +9154,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2936
+#: nova/virt/libvirt/driver.py:2958
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2942
+#: nova/virt/libvirt/driver.py:2964
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3019
+#: nova/virt/libvirt/driver.py:3041
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3109
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3153
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3181
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3193
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9061,67 +9207,72 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3210
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3260
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3332
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
 msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3434
+#: nova/virt/libvirt/driver.py:3455
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3546
+#: nova/virt/libvirt/driver.py:3568
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3566
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
 msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3570
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
 msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3610
+#: nova/virt/libvirt/driver.py:3609
+#, python-format
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3680
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3748
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3754
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3819
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3942
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
 msgid "Checking instance files accessability %s"
 msgstr ""
@@ -9341,47 +9492,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:295 nova/virt/libvirt/vif.py:465
+#: nova/virt/libvirt/vif.py:593
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
-#: nova/virt/libvirt/vif.py:482
+#: nova/virt/libvirt/vif.py:302 nova/virt/libvirt/vif.py:472
+#: nova/virt/libvirt/vif.py:600
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
-#: nova/virt/libvirt/vif.py:495
+#: nova/virt/libvirt/vif.py:326 nova/virt/libvirt/vif.py:486
+#: nova/virt/libvirt/vif.py:614
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:305
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:315
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
+#: nova/virt/libvirt/vif.py:503 nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:551 nova/virt/libvirt/vif.py:573
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:505
+#: nova/virt/libvirt/vif.py:624
 msgid ""
 "The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
 "in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
 "together with a network plugin that reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:532
+#: nova/virt/libvirt/vif.py:651
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9389,7 +9541,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:561
+#: nova/virt/libvirt/vif.py:680
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9397,7 +9549,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:590
+#: nova/virt/libvirt/vif.py:709
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9405,7 +9557,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:617
+#: nova/virt/libvirt/vif.py:736
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -10772,228 +10924,228 @@ msgstr ""
 msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1210
+#: nova/virt/xenapi/vm_utils.py:1208
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1228
+#: nova/virt/xenapi/vm_utils.py:1226
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1250
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1266
+#: nova/virt/xenapi/vm_utils.py:1264
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1276
+#: nova/virt/xenapi/vm_utils.py:1274
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1296
+#: nova/virt/xenapi/vm_utils.py:1294
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1310
+#: nova/virt/xenapi/vm_utils.py:1308
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1319
+#: nova/virt/xenapi/vm_utils.py:1317
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1360
+#: nova/virt/xenapi/vm_utils.py:1358
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1391
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1409
+#: nova/virt/xenapi/vm_utils.py:1407
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1415
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1446
+#: nova/virt/xenapi/vm_utils.py:1444
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1549
+#: nova/virt/xenapi/vm_utils.py:1547
 #, python-format
 msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1577
+#: nova/virt/xenapi/vm_utils.py:1575
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1605
+#: nova/virt/xenapi/vm_utils.py:1603
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1621
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1636
+#: nova/virt/xenapi/vm_utils.py:1634
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1644
+#: nova/virt/xenapi/vm_utils.py:1642
 #, python-format
 msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1646
+#: nova/virt/xenapi/vm_utils.py:1644
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1647
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1652
+#: nova/virt/xenapi/vm_utils.py:1650
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1656
+#: nova/virt/xenapi/vm_utils.py:1654
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1658
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1661
+#: nova/virt/xenapi/vm_utils.py:1659
 #, python-format
 msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1664
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1667
+#: nova/virt/xenapi/vm_utils.py:1665
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1689
+#: nova/virt/xenapi/vm_utils.py:1687
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1706
+#: nova/virt/xenapi/vm_utils.py:1704
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1760
+#: nova/virt/xenapi/vm_utils.py:1758
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1818
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1908
+#: nova/virt/xenapi/vm_utils.py:1906
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1918
 #, python-format
 msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1953
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1975
+#: nova/virt/xenapi/vm_utils.py:1973
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1988
+#: nova/virt/xenapi/vm_utils.py:1986
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1991
+#: nova/virt/xenapi/vm_utils.py:1989
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1997
+#: nova/virt/xenapi/vm_utils.py:1995
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2009
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2036
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2046
+#: nova/virt/xenapi/vm_utils.py:2044
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2048
+#: nova/virt/xenapi/vm_utils.py:2046
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2050
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11001,58 +11153,58 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2067
+#: nova/virt/xenapi/vm_utils.py:2065
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2073
+#: nova/virt/xenapi/vm_utils.py:2071
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2099
+#: nova/virt/xenapi/vm_utils.py:2097
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2114
+#: nova/virt/xenapi/vm_utils.py:2112
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2155
+#: nova/virt/xenapi/vm_utils.py:2153
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2198
+#: nova/virt/xenapi/vm_utils.py:2196
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2234
+#: nova/virt/xenapi/vm_utils.py:2232
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2287
+#: nova/virt/xenapi/vm_utils.py:2285
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2296
+#: nova/virt/xenapi/vm_utils.py:2294
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2409
+#: nova/virt/xenapi/vm_utils.py:2407
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
@@ -11400,3 +11552,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Flavor access alreay exists for flavor"
+#~ " %(flavor_id)s and project %(project_id)s "
+#~ "combination."
+#~ msgstr ""
+
+#~ msgid "Instance failed network setup"
+#~ msgstr ""
+
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
+#~ msgstr ""
+
diff --git a/nova/scheduler/filters/core_filter.py b/nova/scheduler/filters/core_filter.py
index 4eb6ebcf1..6e733a237 100644
--- a/nova/scheduler/filters/core_filter.py
+++ b/nova/scheduler/filters/core_filter.py
@@ -17,6 +17,7 @@
 
 from oslo.config import cfg
 
+from nova import db
 from nova.openstack.common import log as logging
 from nova.scheduler import filters
 
@@ -24,14 +25,19 @@ LOG = logging.getLogger(__name__)
 
 cpu_allocation_ratio_opt = cfg.FloatOpt('cpu_allocation_ratio',
         default=16.0,
-        help='Virtual CPU to Physical CPU allocation ratio')
+        help='Virtual CPU to physical CPU allocation ratio which affects '
+             'all CPU filters. This configuration specifies a global ratio '
+             'for CoreFilter. For AggregateCoreFilter, it will fall back to '
+             'this configuration value if no per-aggregate setting found.')
 
 CONF = cfg.CONF
 CONF.register_opt(cpu_allocation_ratio_opt)
 
 
-class CoreFilter(filters.BaseHostFilter):
-    """CoreFilter filters based on CPU core utilization."""
+class BaseCoreFilter(filters.BaseHostFilter):
+
+    def _get_cpu_allocation_ratio(self, host_state, filter_properties):
+        raise NotImplementedError
 
     def host_passes(self, host_state, filter_properties):
         """Return True if host has sufficient CPU cores."""
@@ -45,7 +51,9 @@ class CoreFilter(filters.BaseHostFilter):
             return True
 
         instance_vcpus = instance_type['vcpus']
-        vcpus_total = host_state.vcpus_total * CONF.cpu_allocation_ratio
+        cpu_allocation_ratio = self._get_cpu_allocation_ratio(host_state,
+                                                          filter_properties)
+        vcpus_total = host_state.vcpus_total * cpu_allocation_ratio
 
         # Only provide a VCPU limit to compute if the virt driver is reporting
         # an accurate count of installed VCPUs. (XenServer driver does not)
@@ -53,3 +61,44 @@ class CoreFilter(filters.BaseHostFilter):
             host_state.limits['vcpu'] = vcpus_total
 
         return (vcpus_total - host_state.vcpus_used) >= instance_vcpus
+
+
+class CoreFilter(BaseCoreFilter):
+    """CoreFilter filters based on CPU core utilization."""
+
+    def _get_cpu_allocation_ratio(self, host_state, filter_properties):
+        return CONF.cpu_allocation_ratio
+
+
+class AggregateCoreFilter(BaseCoreFilter):
+    """AggregateRamFilter with per-aggregate CPU subscription flag.
+
+    Fall back to global cpu_allocation_ratio if no per-aggregate setting found.
+    """
+
+    def _get_cpu_allocation_ratio(self, host_state, filter_properties):
+        context = filter_properties['context'].elevated()
+        # TODO(uni): DB query in filter is a performance hit, especially for
+        # system with lots of hosts. Will need a general solution here to fix
+        # all filters with aggregate DB call things.
+        metadata = db.aggregate_metadata_get_by_host(
+                     context, host_state.host, key='cpu_allocation_ratio')
+        aggregate_vals = metadata.get('cpu_allocation_ratio', set())
+        num_values = len(aggregate_vals)
+
+        if num_values == 0:
+            return CONF.cpu_allocation_ratio
+
+        if num_values > 1:
+            LOG.warning(_("%(num_values)d ratio values found, "
+                          "of which the minimum value will be used."),
+                         {'num_values': num_values})
+
+        try:
+            ratio = float(min(aggregate_vals))
+        except ValueError as e:
+            LOG.warning(_("Could not decode cpu_allocation_ratio: "
+                            "'%(e)s'") % locals())
+            ratio = CONF.cpu_allocation_ratio
+
+        return ratio
diff --git a/nova/scheduler/filters/ram_filter.py b/nova/scheduler/filters/ram_filter.py
index 7e20e3d15..ed601ec32 100644
--- a/nova/scheduler/filters/ram_filter.py
+++ b/nova/scheduler/filters/ram_filter.py
@@ -16,21 +16,27 @@
 
 from oslo.config import cfg
 
+from nova import db
 from nova.openstack.common import log as logging
 from nova.scheduler import filters
 
 LOG = logging.getLogger(__name__)
 
-ram_allocation_ratio_opt = cfg.FloatOpt("ram_allocation_ratio",
+ram_allocation_ratio_opt = cfg.FloatOpt('ram_allocation_ratio',
         default=1.5,
-        help="virtual ram to physical ram allocation ratio")
+        help='Virtual ram to physical ram allocation ratio which affects '
+             'all ram filters. This configuration specifies a global ratio '
+             'for RamFilter. For AggregateRamFilter, it will fall back to '
+             'this configuration value if no per-aggregate setting found.')
 
 CONF = cfg.CONF
 CONF.register_opt(ram_allocation_ratio_opt)
 
 
-class RamFilter(filters.BaseHostFilter):
-    """Ram Filter with over subscription flag."""
+class BaseRamFilter(filters.BaseHostFilter):
+
+    def _get_ram_allocation_ratio(self, host_state, filter_properties):
+        raise NotImplementedError
 
     def host_passes(self, host_state, filter_properties):
         """Only return hosts with sufficient available RAM."""
@@ -39,7 +45,10 @@ class RamFilter(filters.BaseHostFilter):
         free_ram_mb = host_state.free_ram_mb
         total_usable_ram_mb = host_state.total_usable_ram_mb
 
-        memory_mb_limit = total_usable_ram_mb * CONF.ram_allocation_ratio
+        ram_allocation_ratio = self._get_ram_allocation_ratio(host_state,
+                                                          filter_properties)
+
+        memory_mb_limit = total_usable_ram_mb * ram_allocation_ratio
         used_ram_mb = total_usable_ram_mb - free_ram_mb
         usable_ram = memory_mb_limit - used_ram_mb
         if not usable_ram >= requested_ram:
@@ -53,3 +62,44 @@ class RamFilter(filters.BaseHostFilter):
         # save oversubscription limit for compute node to test against:
         host_state.limits['memory_mb'] = memory_mb_limit
         return True
+
+
+class RamFilter(BaseRamFilter):
+    """Ram Filter with over subscription flag."""
+
+    def _get_ram_allocation_ratio(self, host_state, filter_properties):
+        return CONF.ram_allocation_ratio
+
+
+class AggregateRamFilter(BaseRamFilter):
+    """AggregateRamFilter with per-aggregate ram subscription flag.
+
+    Fall back to global ram_allocation_ratio if no per-aggregate setting found.
+    """
+
+    def _get_ram_allocation_ratio(self, host_state, filter_properties):
+        context = filter_properties['context'].elevated()
+        # TODO(uni): DB query in filter is a performance hit, especially for
+        # system with lots of hosts. Will need a general solution here to fix
+        # all filters with aggregate DB call things.
+        metadata = db.aggregate_metadata_get_by_host(
+                     context, host_state.host, key='ram_allocation_ratio')
+        aggregate_vals = metadata.get('ram_allocation_ratio', set())
+        num_values = len(aggregate_vals)
+
+        if num_values == 0:
+            return CONF.ram_allocation_ratio
+
+        if num_values > 1:
+            LOG.warning(_("%(num_values)d ratio values found, "
+                          "of which the minimum value will be used."),
+                         {'num_values': num_values})
+
+        try:
+            ratio = float(min(aggregate_vals))
+        except ValueError as e:
+            LOG.warning(_("Could not decode ram_allocation_ratio: "
+                            "'%(e)s'") % locals())
+            ratio = CONF.ram_allocation_ratio
+
+        return ratio
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index bd99808f4..9d54a153e 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -21,8 +21,6 @@
 Scheduler Service
 """
 
-import sys
-
 from oslo.config import cfg
 
 from nova.compute import rpcapi as compute_rpcapi
@@ -34,15 +32,14 @@ from nova.conductor.tasks import live_migrate
 import nova.context
 from nova import exception
 from nova import manager
-from nova import notifications
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
-from nova.openstack.common.notifier import api as notifier
 from nova.openstack.common import periodic_task
 from nova.openstack.common.rpc import common as rpc_common
 from nova import quota
+from nova.scheduler import utils as scheduler_utils
 
 
 LOG = logging.getLogger(__name__)
@@ -203,54 +200,8 @@ class SchedulerManager(manager.Manager):
 
     def _set_vm_state_and_notify(self, method, updates, context, ex,
                                  request_spec):
-        """changes VM state and notifies."""
-        # FIXME(comstud): Re-factor this somehow. Not sure this belongs in the
-        # scheduler manager like this. We should make this easier.
-        # run_instance only sends a request_spec, and an instance may or may
-        # not have been created in the API (or scheduler) already. If it was
-        # created, there's a 'uuid' set in the instance_properties of the
-        # request_spec.
-        # (littleidea): I refactored this a bit, and I agree
-        # it should be easier :)
-        # The refactoring could go further but trying to minimize changes
-        # for essex timeframe
-
-        LOG.warning(_("Failed to schedule_%(method)s: %(ex)s"),
-                    {'method': method, 'ex': ex})
-
-        vm_state = updates['vm_state']
-        properties = request_spec.get('instance_properties', {})
-        # NOTE(vish): We shouldn't get here unless we have a catastrophic
-        #             failure, so just set all instances to error. if uuid
-        #             is not set, instance_uuids will be set to [None], this
-        #             is solely to preserve existing behavior and can
-        #             be removed along with the 'if instance_uuid:' if we can
-        #             verify that uuid is always set.
-        uuids = [properties.get('uuid')]
-        for instance_uuid in request_spec.get('instance_uuids') or uuids:
-            if instance_uuid:
-                state = vm_state.upper()
-                LOG.warning(_('Setting instance to %s state.'), state,
-                            instance_uuid=instance_uuid)
-
-                # update instance state and notify on the transition
-                (old_ref, new_ref) = self.db.instance_update_and_get_original(
-                        context, instance_uuid, updates)
-                notifications.send_update(context, old_ref, new_ref,
-                        service="scheduler")
-                compute_utils.add_instance_fault_from_exc(context,
-                        conductor_api.LocalAPI(),
-                        new_ref, ex, sys.exc_info())
-
-            payload = dict(request_spec=request_spec,
-                           instance_properties=properties,
-                           instance_id=instance_uuid,
-                           state=vm_state,
-                           method=method,
-                           reason=ex)
-
-            notifier.notify(context, notifier.publisher_id("scheduler"),
-                            'scheduler.' + method, notifier.ERROR, payload)
+        scheduler_utils.set_vm_state_and_notify(
+            context, 'scheduler', method, updates, ex, request_spec, self.db)
 
     # NOTE(hanlind): This method can be removed in v3.0 of the RPC API.
     def show_host_resources(self, context, host):
diff --git a/nova/scheduler/utils.py b/nova/scheduler/utils.py
index aa6cff149..eeb68f439 100644
--- a/nova/scheduler/utils.py
+++ b/nova/scheduler/utils.py
@@ -14,9 +14,17 @@
 
 """Utility methods for scheduling."""
 
+import sys
+
 from nova.compute import flavors
+from nova.compute import utils as compute_utils
 from nova import db
+from nova import notifications
 from nova.openstack.common import jsonutils
+from nova.openstack.common import log as logging
+from nova.openstack.common.notifier import api as notifier
+
+LOG = logging.getLogger(__name__)
 
 
 def build_request_spec(ctxt, image, instances):
@@ -41,3 +49,46 @@ def build_request_spec(ctxt, image, instances):
             # scheduler to conductor.  Provides backwards compatibility now.
             'instance_uuids': [inst['uuid'] for inst in instances]}
     return jsonutils.to_primitive(request_spec)
+
+
+def set_vm_state_and_notify(context, service, method, updates, ex,
+                            request_spec, db):
+    """changes VM state and notifies."""
+    LOG.warning(_("Failed to %(service)s_%(method)s: %(ex)s"),
+                {'service': service, 'method': method, 'ex': ex})
+
+    vm_state = updates['vm_state']
+    properties = request_spec.get('instance_properties', {})
+    # NOTE(vish): We shouldn't get here unless we have a catastrophic
+    #             failure, so just set all instances to error. if uuid
+    #             is not set, instance_uuids will be set to [None], this
+    #             is solely to preserve existing behavior and can
+    #             be removed along with the 'if instance_uuid:' if we can
+    #             verify that uuid is always set.
+    uuids = [properties.get('uuid')]
+    from nova.conductor import api as conductor_api
+    for instance_uuid in request_spec.get('instance_uuids') or uuids:
+        if instance_uuid:
+            state = vm_state.upper()
+            LOG.warning(_('Setting instance to %s state.'), state,
+                        instance_uuid=instance_uuid)
+
+            # update instance state and notify on the transition
+            (old_ref, new_ref) = db.instance_update_and_get_original(
+                    context, instance_uuid, updates)
+            notifications.send_update(context, old_ref, new_ref,
+                    service=service)
+            compute_utils.add_instance_fault_from_exc(context,
+                    conductor_api.LocalAPI(),
+                    new_ref, ex, sys.exc_info())
+
+        payload = dict(request_spec=request_spec,
+                        instance_properties=properties,
+                        instance_id=instance_uuid,
+                        state=vm_state,
+                        method=method,
+                        reason=ex)
+
+        event_type = '%s.%s' % (service, method)
+        notifier.notify(context, notifier.publisher_id(service),
+                        event_type, notifier.ERROR, payload)
diff --git a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py b/nova/tests/api/openstack/compute/contrib/test_availability_zone.py
index 2ccb9fa31..0b63960ce 100644
--- a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py
+++ b/nova/tests/api/openstack/compute/contrib/test_availability_zone.py
@@ -76,6 +76,7 @@ def fake_set_availability_zones(context, services):
 class AvailabilityZoneApiTest(test.TestCase):
     def setUp(self):
         super(AvailabilityZoneApiTest, self).setUp()
+        availability_zones._reset_cache()
         self.stubs.Set(db, 'service_get_all', fake_service_get_all)
         self.stubs.Set(availability_zones, 'set_availability_zones',
                        fake_set_availability_zones)
diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py b/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py
index 814c0fff4..59d60acf2 100644
--- a/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py
+++ b/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py
@@ -19,6 +19,7 @@ import webob
 from nova.api.openstack.compute.contrib import extended_availability_zone
 from nova import availability_zones
 from nova import compute
+from nova.compute import vm_states
 from nova import exception
 from nova.openstack.common import jsonutils
 from nova import test
@@ -29,14 +30,31 @@ UUID2 = '00000000-0000-0000-0000-000000000002'
 UUID3 = '00000000-0000-0000-0000-000000000003'
 
 
+def fake_compute_get_az(*args, **kwargs):
+    inst = fakes.stub_instance(1, uuid=UUID3, host="get-host",
+                               vm_state=vm_states.ACTIVE,
+                               availability_zone='fakeaz')
+    return inst
+
+
+def fake_compute_get_empty(*args, **kwargs):
+    inst = fakes.stub_instance(1, uuid=UUID3, host="",
+                               vm_state=vm_states.ACTIVE,
+                               availability_zone='fakeaz')
+    return inst
+
+
 def fake_compute_get(*args, **kwargs):
-    inst = fakes.stub_instance(1, uuid=UUID3, host="get-host")
+    inst = fakes.stub_instance(1, uuid=UUID3, host="get-host",
+                               vm_state=vm_states.ACTIVE)
     return inst
 
 
 def fake_compute_get_all(*args, **kwargs):
-    inst1 = fakes.stub_instance(1, uuid=UUID1, host="all-host")
-    inst2 = fakes.stub_instance(2, uuid=UUID2, host="all-host")
+    inst1 = fakes.stub_instance(1, uuid=UUID1, host="all-host",
+                                vm_state=vm_states.ACTIVE)
+    inst2 = fakes.stub_instance(2, uuid=UUID2, host="all-host",
+                                vm_state=vm_states.ACTIVE)
     return [inst1, inst2]
 
 
@@ -44,12 +62,17 @@ def fake_get_host_availability_zone(context, host):
     return host
 
 
+def fake_get_no_host_availability_zone(context, host):
+    return None
+
+
 class ExtendedServerAttributesTest(test.TestCase):
     content_type = 'application/json'
     prefix = 'OS-EXT-AZ:'
 
     def setUp(self):
         super(ExtendedServerAttributesTest, self).setUp()
+        availability_zones._reset_cache()
         fakes.stub_out_nw_api(self.stubs)
         self.stubs.Set(compute.api.API, 'get', fake_compute_get)
         self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all)
@@ -77,6 +100,28 @@ class ExtendedServerAttributesTest(test.TestCase):
         self.assertEqual(server.get('%savailability_zone' % self.prefix),
                          az)
 
+    def test_show_no_host_az(self):
+        self.stubs.Set(compute.api.API, 'get', fake_compute_get_az)
+        self.stubs.Set(availability_zones, 'get_host_availability_zone',
+                       fake_get_no_host_availability_zone)
+
+        url = '/v2/fake/servers/%s' % UUID3
+        res = self._make_request(url)
+
+        self.assertEqual(res.status_int, 200)
+        self.assertServerAttributes(self._get_server(res.body), 'fakeaz')
+
+    def test_show_empty_host_az(self):
+        self.stubs.Set(compute.api.API, 'get', fake_compute_get_empty)
+        self.stubs.Set(availability_zones, 'get_host_availability_zone',
+                       fake_get_no_host_availability_zone)
+
+        url = '/v2/fake/servers/%s' % UUID3
+        res = self._make_request(url)
+
+        self.assertEqual(res.status_int, 200)
+        self.assertServerAttributes(self._get_server(res.body), 'fakeaz')
+
     def test_show(self):
         url = '/v2/fake/servers/%s' % UUID3
         res = self._make_request(url)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_cells.py b/nova/tests/api/openstack/compute/plugins/v3/test_cells.py
new file mode 100644
index 000000000..f369c06e3
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_cells.py
@@ -0,0 +1,469 @@
+# Copyright 2011-2012 OpenStack Foundation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import copy
+
+from lxml import etree
+from webob import exc
+
+from nova.api.openstack.compute.plugins.v3 import cells as cells_ext
+from nova.api.openstack import extensions
+from nova.api.openstack import xmlutil
+from nova.cells import rpcapi as cells_rpcapi
+from nova import context
+from nova import db
+from nova import exception
+from nova.openstack.common import timeutils
+from nova import test
+from nova.tests.api.openstack import fakes
+from nova.tests import utils
+
+
+FAKE_CELLS = [
+        dict(id=1, name='cell1', username='bob', is_parent=True,
+                weight_scale=1.0, weight_offset=0.0,
+                rpc_host='r1.example.org', password='xxxx'),
+        dict(id=2, name='cell2', username='alice', is_parent=False,
+                weight_scale=1.0, weight_offset=0.0,
+                rpc_host='r2.example.org', password='qwerty')]
+
+
+FAKE_CAPABILITIES = [
+        {'cap1': '0,1', 'cap2': '2,3'},
+        {'cap3': '4,5', 'cap4': '5,6'}]
+
+
+def fake_db_cell_get(context, cell_name):
+    for cell in FAKE_CELLS:
+        if cell_name == cell['name']:
+            return cell
+    else:
+        raise exception.CellNotFound(cell_name=cell_name)
+
+
+def fake_db_cell_create(context, values):
+    cell = dict(id=1)
+    cell.update(values)
+    return cell
+
+
+def fake_db_cell_update(context, cell_id, values):
+    cell = fake_db_cell_get(context, cell_id)
+    cell.update(values)
+    return cell
+
+
+def fake_cells_api_get_all_cell_info(*args):
+    cells = copy.deepcopy(FAKE_CELLS)
+    del cells[0]['password']
+    del cells[1]['password']
+    for i, cell in enumerate(cells):
+        cell['capabilities'] = FAKE_CAPABILITIES[i]
+    return cells
+
+
+def fake_db_cell_get_all(context):
+    return FAKE_CELLS
+
+
+class CellsTest(test.TestCase):
+    def setUp(self):
+        super(CellsTest, self).setUp()
+        self.stubs.Set(db, 'cell_get', fake_db_cell_get)
+        self.stubs.Set(db, 'cell_get_all', fake_db_cell_get_all)
+        self.stubs.Set(db, 'cell_update', fake_db_cell_update)
+        self.stubs.Set(db, 'cell_create', fake_db_cell_create)
+        self.stubs.Set(cells_rpcapi.CellsAPI, 'get_cell_info_for_neighbors',
+                fake_cells_api_get_all_cell_info)
+
+        self.controller = cells_ext.CellsController()
+        self.context = context.get_admin_context()
+
+    def _get_request(self, resource):
+        return fakes.HTTPRequestV3.blank('/' + resource)
+
+    def test_index(self):
+        req = self._get_request("cells")
+        res_dict = self.controller.index(req)
+
+        self.assertEqual(len(res_dict['cells']), 2)
+        for i, cell in enumerate(res_dict['cells']):
+            self.assertEqual(cell['name'], FAKE_CELLS[i]['name'])
+            self.assertNotIn('capabilitiles', cell)
+            self.assertNotIn('password', cell)
+
+    def test_detail(self):
+        req = self._get_request("cells/detail")
+        res_dict = self.controller.detail(req)
+
+        self.assertEqual(len(res_dict['cells']), 2)
+        for i, cell in enumerate(res_dict['cells']):
+            self.assertEqual(cell['name'], FAKE_CELLS[i]['name'])
+            self.assertEqual(cell['capabilities'], FAKE_CAPABILITIES[i])
+            self.assertNotIn('password', cell)
+
+    def test_show_bogus_cell_raises(self):
+        req = self._get_request("cells/bogus")
+        self.assertRaises(exc.HTTPNotFound, self.controller.show, req, 'bogus')
+
+    def test_get_cell_by_name(self):
+        req = self._get_request("cells/cell1")
+        res_dict = self.controller.show(req, 'cell1')
+        cell = res_dict['cell']
+
+        self.assertEqual(cell['name'], 'cell1')
+        self.assertEqual(cell['rpc_host'], 'r1.example.org')
+        self.assertNotIn('password', cell)
+
+    def test_cell_delete(self):
+        call_info = {'delete_called': 0}
+
+        def fake_db_cell_delete(context, cell_name):
+            self.assertEqual(cell_name, 'cell999')
+            call_info['delete_called'] += 1
+
+        self.stubs.Set(db, 'cell_delete', fake_db_cell_delete)
+
+        req = self._get_request("cells/cell999")
+        self.controller.delete(req, 'cell999')
+        self.assertEqual(call_info['delete_called'], 1)
+
+    def test_delete_bogus_cell_raises(self):
+        req = self._get_request("cells/cell999")
+        req.environ['nova.context'] = self.context
+        self.assertRaises(exc.HTTPNotFound, self.controller.delete, req,
+                'cell999')
+
+    def test_cell_create_parent(self):
+        body = {'cell': {'name': 'meow',
+                        'username': 'fred',
+                        'password': 'fubar',
+                        'rpc_host': 'r3.example.org',
+                        'type': 'parent',
+                        # Also test this is ignored/stripped
+                        'is_parent': False}}
+
+        req = self._get_request("cells")
+        res_dict = self.controller.create(req, body)
+        cell = res_dict['cell']
+
+        self.assertEqual(cell['name'], 'meow')
+        self.assertEqual(cell['username'], 'fred')
+        self.assertEqual(cell['rpc_host'], 'r3.example.org')
+        self.assertEqual(cell['type'], 'parent')
+        self.assertNotIn('password', cell)
+        self.assertNotIn('is_parent', cell)
+
+    def test_cell_create_child(self):
+        body = {'cell': {'name': 'meow',
+                        'username': 'fred',
+                        'password': 'fubar',
+                        'rpc_host': 'r3.example.org',
+                        'type': 'child'}}
+
+        req = self._get_request("cells")
+        res_dict = self.controller.create(req, body)
+        cell = res_dict['cell']
+
+        self.assertEqual(cell['name'], 'meow')
+        self.assertEqual(cell['username'], 'fred')
+        self.assertEqual(cell['rpc_host'], 'r3.example.org')
+        self.assertEqual(cell['type'], 'child')
+        self.assertNotIn('password', cell)
+        self.assertNotIn('is_parent', cell)
+
+    def test_cell_create_no_name_raises(self):
+        body = {'cell': {'username': 'moocow',
+                         'password': 'secret',
+                         'rpc_host': 'r3.example.org',
+                         'type': 'parent'}}
+
+        req = self._get_request("cells")
+        self.assertRaises(exc.HTTPBadRequest,
+            self.controller.create, req, body)
+
+    def test_cell_create_name_empty_string_raises(self):
+        body = {'cell': {'name': '',
+                         'username': 'fred',
+                         'password': 'secret',
+                         'rpc_host': 'r3.example.org',
+                         'type': 'parent'}}
+
+        req = self._get_request("cells")
+        self.assertRaises(exc.HTTPBadRequest,
+            self.controller.create, req, body)
+
+    def test_cell_create_name_with_bang_raises(self):
+        body = {'cell': {'name': 'moo!cow',
+                         'username': 'fred',
+                         'password': 'secret',
+                         'rpc_host': 'r3.example.org',
+                         'type': 'parent'}}
+
+        req = self._get_request("cells")
+        self.assertRaises(exc.HTTPBadRequest,
+            self.controller.create, req, body)
+
+    def test_cell_create_name_with_dot_raises(self):
+        body = {'cell': {'name': 'moo.cow',
+                         'username': 'fred',
+                         'password': 'secret',
+                         'rpc_host': 'r3.example.org',
+                         'type': 'parent'}}
+
+        req = self._get_request("cells")
+        self.assertRaises(exc.HTTPBadRequest,
+            self.controller.create, req, body)
+
+    def test_cell_create_name_with_invalid_type_raises(self):
+        body = {'cell': {'name': 'moocow',
+                         'username': 'fred',
+                         'password': 'secret',
+                         'rpc_host': 'r3.example.org',
+                         'type': 'invalid'}}
+
+        req = self._get_request("cells")
+        self.assertRaises(exc.HTTPBadRequest,
+            self.controller.create, req, body)
+
+    def test_cell_update(self):
+        body = {'cell': {'username': 'zeb',
+                         'password': 'sneaky'}}
+
+        req = self._get_request("cells/cell1")
+        res_dict = self.controller.update(req, 'cell1', body)
+        cell = res_dict['cell']
+
+        self.assertEqual(cell['name'], 'cell1')
+        self.assertEqual(cell['rpc_host'], FAKE_CELLS[0]['rpc_host'])
+        self.assertEqual(cell['username'], 'zeb')
+        self.assertNotIn('password', cell)
+
+    def test_cell_update_empty_name_raises(self):
+        body = {'cell': {'name': '',
+                         'username': 'zeb',
+                         'password': 'sneaky'}}
+
+        req = self._get_request("cells/cell1")
+        self.assertRaises(exc.HTTPBadRequest,
+            self.controller.update, req, 'cell1', body)
+
+    def test_cell_update_invalid_type_raises(self):
+        body = {'cell': {'username': 'zeb',
+                         'type': 'invalid',
+                         'password': 'sneaky'}}
+
+        req = self._get_request("cells/cell1")
+        self.assertRaises(exc.HTTPBadRequest,
+            self.controller.update, req, 'cell1', body)
+
+    def test_cell_info(self):
+        caps = ['cap1=a;b', 'cap2=c;d']
+        self.flags(name='darksecret', capabilities=caps, group='cells')
+
+        req = self._get_request("cells/info")
+        res_dict = self.controller.info(req)
+        cell = res_dict['cell']
+        cell_caps = cell['capabilities']
+
+        self.assertEqual(cell['name'], 'darksecret')
+        self.assertEqual(cell_caps['cap1'], 'a;b')
+        self.assertEqual(cell_caps['cap2'], 'c;d')
+
+    def test_show_capacities(self):
+        self.mox.StubOutWithMock(self.controller.cells_rpcapi,
+                                 'get_capacities')
+        response = {"ram_free":
+                        {"units_by_mb": {"8192": 0, "512": 13,
+                                "4096": 1, "2048": 3, "16384": 0},
+                        "total_mb": 7680},
+                    "disk_free":
+                        {"units_by_mb": {"81920": 11, "20480": 46,
+                                "40960": 23, "163840": 5, "0": 0},
+                        "total_mb": 1052672}
+                    }
+        self.controller.cells_rpcapi.\
+            get_capacities(self.context, cell_name=None).AndReturn(response)
+        self.mox.ReplayAll()
+        req = self._get_request("cells/capacities")
+        req.environ["nova.context"] = self.context
+        res_dict = self.controller.capacities(req)
+        self.assertEqual(response, res_dict['cell']['capacities'])
+
+    def test_show_capacity_fails_with_non_admin_context(self):
+        rules = {"compute_extension:cells": "is_admin:true"}
+        self.policy.set_rules(rules)
+
+        self.mox.ReplayAll()
+        req = self._get_request("cells/capacities")
+        req.environ["nova.context"] = self.context
+        req.environ["nova.context"].is_admin = False
+        self.assertRaises(exception.PolicyNotAuthorized,
+                          self.controller.capacities, req)
+
+    def test_show_capacities_for_invalid_cell(self):
+        self.mox.StubOutWithMock(self.controller.cells_rpcapi,
+                                 'get_capacities')
+        self.controller.cells_rpcapi. \
+            get_capacities(self.context, cell_name="invalid_cell").AndRaise(
+            exception.CellNotFound(cell_name="invalid_cell"))
+        self.mox.ReplayAll()
+        req = self._get_request("cells/invalid_cell/capacities")
+        req.environ["nova.context"] = self.context
+        self.assertRaises(exc.HTTPNotFound,
+                          self.controller.capacities, req, "invalid_cell")
+
+    def test_show_capacities_for_cell(self):
+        self.mox.StubOutWithMock(self.controller.cells_rpcapi,
+                                 'get_capacities')
+        response = {"ram_free":
+                        {"units_by_mb": {"8192": 0, "512": 13,
+                                "4096": 1, "2048": 3, "16384": 0},
+                        "total_mb": 7680},
+                    "disk_free":
+                        {"units_by_mb": {"81920": 11, "20480": 46,
+                                "40960": 23, "163840": 5, "0": 0},
+                        "total_mb": 1052672}
+                    }
+        self.controller.cells_rpcapi.\
+                        get_capacities(self.context, cell_name='cell_name').\
+                            AndReturn(response)
+        self.mox.ReplayAll()
+        req = self._get_request("cells/capacities")
+        req.environ["nova.context"] = self.context
+        res_dict = self.controller.capacities(req, 'cell_name')
+        self.assertEqual(response, res_dict['cell']['capacities'])
+
+    def test_sync_instances(self):
+        call_info = {}
+
+        def sync_instances(self, context, **kwargs):
+            call_info['project_id'] = kwargs.get('project_id')
+            call_info['updated_since'] = kwargs.get('updated_since')
+
+        self.stubs.Set(cells_rpcapi.CellsAPI, 'sync_instances', sync_instances)
+
+        req = self._get_request("cells/sync_instances")
+        body = {}
+        self.controller.sync_instances(req, body=body)
+        self.assertEqual(call_info['project_id'], None)
+        self.assertEqual(call_info['updated_since'], None)
+
+        body = {'project_id': 'test-project'}
+        self.controller.sync_instances(req, body=body)
+        self.assertEqual(call_info['project_id'], 'test-project')
+        self.assertEqual(call_info['updated_since'], None)
+
+        expected = timeutils.utcnow().isoformat()
+        if not expected.endswith("+00:00"):
+            expected += "+00:00"
+
+        body = {'updated_since': expected}
+        self.controller.sync_instances(req, body=body)
+        self.assertEqual(call_info['project_id'], None)
+        self.assertEqual(call_info['updated_since'], expected)
+
+        body = {'updated_since': 'skjdfkjsdkf'}
+        self.assertRaises(exc.HTTPBadRequest,
+                self.controller.sync_instances, req, body=body)
+
+        body = {'foo': 'meow'}
+        self.assertRaises(exc.HTTPBadRequest,
+                self.controller.sync_instances, req, body=body)
+
+
+class TestCellsXMLSerializer(test.TestCase):
+    def test_multiple_cells(self):
+        fixture = {'cells': fake_cells_api_get_all_cell_info()}
+
+        serializer = cells_ext.CellsTemplate()
+        output = serializer.serialize(fixture)
+        res_tree = etree.XML(output)
+
+        self.assertEqual(res_tree.tag, '{%s}cells' % xmlutil.XMLNS_V10)
+        self.assertEqual(len(res_tree), 2)
+        self.assertEqual(res_tree[0].tag, '{%s}cell' % xmlutil.XMLNS_V10)
+        self.assertEqual(res_tree[1].tag, '{%s}cell' % xmlutil.XMLNS_V10)
+
+    def test_single_cell_with_caps(self):
+        cell = {'id': 1,
+                'name': 'darksecret',
+                'username': 'meow',
+                'capabilities': {'cap1': 'a;b',
+                                 'cap2': 'c;d'}}
+        fixture = {'cell': cell}
+
+        serializer = cells_ext.CellTemplate()
+        output = serializer.serialize(fixture)
+        res_tree = etree.XML(output)
+
+        self.assertEqual(res_tree.tag, '{%s}cell' % xmlutil.XMLNS_V10)
+        self.assertEqual(res_tree.get('name'), 'darksecret')
+        self.assertEqual(res_tree.get('username'), 'meow')
+        self.assertEqual(res_tree.get('password'), None)
+        self.assertEqual(len(res_tree), 1)
+
+        child = res_tree[0]
+        self.assertEqual(child.tag,
+                '{%s}capabilities' % xmlutil.XMLNS_V10)
+        for elem in child:
+            self.assertIn(elem.tag, ('{%s}cap1' % xmlutil.XMLNS_V10,
+                                      '{%s}cap2' % xmlutil.XMLNS_V10))
+            if elem.tag == '{%s}cap1' % xmlutil.XMLNS_V10:
+                self.assertEqual(elem.text, 'a;b')
+            elif elem.tag == '{%s}cap2' % xmlutil.XMLNS_V10:
+                self.assertEqual(elem.text, 'c;d')
+
+    def test_single_cell_without_caps(self):
+        cell = {'id': 1,
+                'username': 'woof',
+                'name': 'darksecret'}
+        fixture = {'cell': cell}
+
+        serializer = cells_ext.CellTemplate()
+        output = serializer.serialize(fixture)
+        res_tree = etree.XML(output)
+
+        self.assertEqual(res_tree.tag, '{%s}cell' % xmlutil.XMLNS_V10)
+        self.assertEqual(res_tree.get('name'), 'darksecret')
+        self.assertEqual(res_tree.get('username'), 'woof')
+        self.assertEqual(res_tree.get('password'), None)
+        self.assertEqual(len(res_tree), 0)
+
+
+class TestCellsXMLDeserializer(test.TestCase):
+    def test_cell_deserializer(self):
+        caps_dict = {'cap1': 'a;b',
+                             'cap2': 'c;d'}
+        caps_xml = ("<capabilities><cap1>a;b</cap1>"
+                "<cap2>c;d</cap2></capabilities>")
+        expected = {'cell': {'name': 'testcell1',
+                             'type': 'child',
+                             'rpc_host': 'localhost',
+                             'capabilities': caps_dict}}
+        intext = ("<?xml version='1.0' encoding='UTF-8'?>\n"
+                "<cell><name>testcell1</name><type>child</type>"
+                        "<rpc_host>localhost</rpc_host>"
+                        "%s</cell>") % caps_xml
+        deserializer = cells_ext.CellDeserializer()
+        result = deserializer.deserialize(intext)
+        self.assertEqual(dict(body=expected), result)
+
+    def test_with_corrupt_xml(self):
+        deserializer = cells_ext.CellDeserializer()
+        self.assertRaises(
+                exception.MalformedRequestBody,
+                deserializer.deserialize,
+                utils.killer_xml_body())
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_disabled.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_disabled.py
new file mode 100644
index 000000000..5ff7f4035
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_disabled.py
@@ -0,0 +1,101 @@
+# Copyright 2012 Nebula, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from lxml import etree
+import webob
+
+from nova.api.openstack.compute.plugins.v3 import flavor_disabled
+from nova.compute import flavors
+from nova.openstack.common import jsonutils
+from nova import test
+from nova.tests.api.openstack import fakes
+
+FAKE_FLAVORS = {
+    'flavor 1': {
+        "flavorid": '1',
+        "name": 'flavor 1',
+        "memory_mb": '256',
+        "root_gb": '10',
+        "disabled": False,
+    },
+    'flavor 2': {
+        "flavorid": '2',
+        "name": 'flavor 2',
+        "memory_mb": '512',
+        "root_gb": '20',
+        "disabled": True,
+    },
+}
+
+
+def fake_flavor_get_by_flavor_id(flavorid):
+    return FAKE_FLAVORS['flavor %s' % flavorid]
+
+
+def fake_flavor_get_all(*args, **kwargs):
+    return FAKE_FLAVORS
+
+
+class FlavorDisabledTest(test.TestCase):
+    content_type = 'application/json'
+    prefix = '%s:' % flavor_disabled.FlavorDisabled.alias
+
+    def setUp(self):
+        super(FlavorDisabledTest, self).setUp()
+        fakes.stub_out_nw_api(self.stubs)
+        self.stubs.Set(flavors, "get_all_flavors",
+                       fake_flavor_get_all)
+        self.stubs.Set(flavors,
+                       "get_flavor_by_flavor_id",
+                       fake_flavor_get_by_flavor_id)
+
+    def _make_request(self, url):
+        req = webob.Request.blank(url)
+        req.headers['Accept'] = self.content_type
+        app = fakes.wsgi_app_v3(init_only=('servers', 'flavors',
+                                           'os-flavor-disabled'))
+        return req.get_response(app)
+
+    def _get_flavor(self, body):
+        return jsonutils.loads(body).get('flavor')
+
+    def _get_flavors(self, body):
+        return jsonutils.loads(body).get('flavors')
+
+    def assertFlavorDisabled(self, flavor, disabled):
+        self.assertEqual(str(flavor.get('%sdisabled' % self.prefix)), disabled)
+
+    def test_show(self):
+        res = self._make_request('/v3/flavors/1')
+        self.assertEqual(res.status_int, 200, res.body)
+        self.assertFlavorDisabled(self._get_flavor(res.body), 'False')
+
+    def test_detail(self):
+        res = self._make_request('/v3/flavors/detail')
+
+        self.assertEqual(res.status_int, 200, res.body)
+        flavors = self._get_flavors(res.body)
+        self.assertFlavorDisabled(flavors[0], 'False')
+        self.assertFlavorDisabled(flavors[1], 'True')
+
+
+class FlavorDisabledXmlTest(FlavorDisabledTest):
+    content_type = 'application/xml'
+    prefix = '{%s}' % flavor_disabled.FlavorDisabled.namespace
+
+    def _get_flavor(self, body):
+        return etree.XML(body)
+
+    def _get_flavors(self, body):
+        return etree.XML(body).getchildren()
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
index 6680460de..d204af11f 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
@@ -437,30 +437,36 @@ class FlavorsTest(test.TestCase):
 
 
 class FlavorsXMLSerializationTest(test.TestCase):
-
-    def test_xml_declaration(self):
-        serializer = flavors.FlavorTemplate()
-
-        fixture = {
-            "flavor": {
-                "id": "12",
+    def _create_flavor(self):
+        id = 0
+        while True:
+            id += 1
+            yield {
+                "id": str(id),
                 "name": "asdf",
                 "ram": "256",
                 "disk": "10",
                 "vcpus": "",
+                "swap": "512",
                 "links": [
                     {
                         "rel": "self",
-                        "href": "http://localhost/v3/flavors/12",
+                        "href": "http://localhost/v3/flavors/%s" % id,
                     },
                     {
                         "rel": "bookmark",
-                        "href": "http://localhost/flavors/12",
+                        "href": "http://localhost/flavors/%s" % id,
                     },
                 ],
-            },
-        }
+            }
+
+    def setUp(self):
+        super(FlavorsXMLSerializationTest, self).setUp()
+        self.flavors = self._create_flavor()
 
+    def test_xml_declaration(self):
+        serializer = flavors.FlavorTemplate()
+        fixture = {'flavor': next(self.flavors)}
         output = serializer.serialize(fixture)
         has_dec = output.startswith("<?xml version='1.0' encoding='UTF-8'?>")
         self.assertTrue(has_dec)
@@ -468,29 +474,10 @@ class FlavorsXMLSerializationTest(test.TestCase):
     def test_show(self):
         serializer = flavors.FlavorTemplate()
 
-        fixture = {
-            "flavor": {
-                "id": "12",
-                "name": "asdf",
-                "ram": "256",
-                "disk": "10",
-                "vcpus": "",
-                "links": [
-                    {
-                        "rel": "self",
-                        "href": "http://localhost/v3/flavors/12",
-                    },
-                    {
-                        "rel": "bookmark",
-                        "href": "http://localhost/flavors/12",
-                    },
-                ],
-            },
-        }
-
+        fixture = {'flavor': next(self.flavors)}
         output = serializer.serialize(fixture)
         root = etree.XML(output)
-        xmlutil.validate_schema(root, 'flavor')
+        xmlutil.validate_schema(root, 'flavor', version='v3')
         flavor_dict = fixture['flavor']
 
         for key in ['name', 'id', 'ram', 'disk']:
@@ -505,29 +492,10 @@ class FlavorsXMLSerializationTest(test.TestCase):
     def test_show_handles_integers(self):
         serializer = flavors.FlavorTemplate()
 
-        fixture = {
-            "flavor": {
-                "id": 12,
-                "name": "asdf",
-                "ram": 256,
-                "disk": 10,
-                "vcpus": "",
-                "links": [
-                    {
-                        "rel": "self",
-                        "href": "http://localhost/v3/flavors/12",
-                    },
-                    {
-                        "rel": "bookmark",
-                        "href": "http://localhost/flavors/12",
-                    },
-                ],
-            },
-        }
-
+        fixture = {'flavor': next(self.flavors)}
         output = serializer.serialize(fixture)
         root = etree.XML(output)
-        xmlutil.validate_schema(root, 'flavor')
+        xmlutil.validate_schema(root, 'flavor', version='v3')
         flavor_dict = fixture['flavor']
 
         for key in ['name', 'id', 'ram', 'disk']:
@@ -544,46 +512,14 @@ class FlavorsXMLSerializationTest(test.TestCase):
 
         fixture = {
             "flavors": [
-                {
-                    "id": "23",
-                    "name": "flavor 23",
-                    "ram": "512",
-                    "disk": "20",
-                    "vcpus": "",
-                    "links": [
-                        {
-                            "rel": "self",
-                            "href": "http://localhost/v3/flavors/23",
-                        },
-                        {
-                            "rel": "bookmark",
-                            "href": "http://localhost/flavors/23",
-                        },
-                    ],
-                },
-                {
-                    "id": "13",
-                    "name": "flavor 13",
-                    "ram": "256",
-                    "disk": "10",
-                    "vcpus": "",
-                    "links": [
-                        {
-                            "rel": "self",
-                            "href": "http://localhost/v3/flavors/13",
-                        },
-                        {
-                            "rel": "bookmark",
-                            "href": "http://localhost/flavors/13",
-                        },
-                    ],
-                },
+                next(self.flavors),
+                next(self.flavors),
             ],
         }
 
         output = serializer.serialize(fixture)
         root = etree.XML(output)
-        xmlutil.validate_schema(root, 'flavors')
+        xmlutil.validate_schema(root, 'flavors', version='v3')
         flavor_elems = root.findall('{0}flavor'.format(NS))
         self.assertEqual(len(flavor_elems), 2)
         for i, flavor_elem in enumerate(flavor_elems):
@@ -603,40 +539,8 @@ class FlavorsXMLSerializationTest(test.TestCase):
 
         fixture = {
             "flavors": [
-                {
-                    "id": "23",
-                    "name": "flavor 23",
-                    "ram": "512",
-                    "disk": "20",
-                    "vcpus": "",
-                    "links": [
-                        {
-                            "rel": "self",
-                            "href": "http://localhost/v3/flavors/23",
-                        },
-                        {
-                            "rel": "bookmark",
-                            "href": "http://localhost/flavors/23",
-                        },
-                    ],
-                },
-                {
-                    "id": "13",
-                    "name": "flavor 13",
-                    "ram": "256",
-                    "disk": "10",
-                    "vcpus": "",
-                    "links": [
-                        {
-                            "rel": "self",
-                            "href": "http://localhost/v3/flavors/13",
-                        },
-                        {
-                            "rel": "bookmark",
-                            "href": "http://localhost/flavors/13",
-                        },
-                    ],
-                },
+                next(self.flavors),
+                next(self.flavors),
             ],
         }
 
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_images.py b/nova/tests/api/openstack/compute/plugins/v3/test_images.py
new file mode 100644
index 000000000..712e3c8a5
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_images.py
@@ -0,0 +1,1336 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 OpenStack Foundation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+Tests of the new image services, both as a service layer,
+and as a WSGI layer
+"""
+
+import urlparse
+
+from lxml import etree
+import webob
+
+from nova.api.openstack.compute.plugins.v3 import images
+from nova.api.openstack.compute.views import images as images_view
+from nova.api.openstack import xmlutil
+from nova import exception
+from nova.image import glance
+from nova import test
+from nova.tests.api.openstack import fakes
+from nova.tests import matchers
+
+NS = "{http://docs.openstack.org/compute/api/v1.1}"
+ATOMNS = "{http://www.w3.org/2005/Atom}"
+NOW_API_FORMAT = "2010-10-11T10:30:22Z"
+
+
+class ImagesControllerTest(test.TestCase):
+    """
+    Test of the OpenStack API /images application controller w/Glance.
+    """
+
+    def setUp(self):
+        """Run before each test."""
+        super(ImagesControllerTest, self).setUp()
+        fakes.stub_out_networking(self.stubs)
+        fakes.stub_out_rate_limiting(self.stubs)
+        fakes.stub_out_key_pair_funcs(self.stubs)
+        fakes.stub_out_compute_api_snapshot(self.stubs)
+        fakes.stub_out_compute_api_backup(self.stubs)
+        fakes.stub_out_glance(self.stubs)
+
+        self.controller = images.ImagesController()
+
+    def test_get_image(self):
+        fake_req = fakes.HTTPRequestV3.blank('/os-images/123')
+        actual_image = self.controller.show(fake_req, '124')
+
+        href = "http://localhost/v3/images/124"
+        bookmark = "http://localhost/images/124"
+        alternate = "%s/fake/images/124" % glance.generate_glance_url()
+        server_uuid = "aa640691-d1a7-4a67-9d3c-d35ee6b3cc74"
+        server_href = "http://localhost/v3/servers/" + server_uuid
+        server_bookmark = "http://localhost/servers/" + server_uuid
+
+        expected_image = {
+            "image": {
+                "id": "124",
+                "name": "queued snapshot",
+                "updated": NOW_API_FORMAT,
+                "created": NOW_API_FORMAT,
+                "status": "SAVING",
+                "progress": 25,
+                "minDisk": 0,
+                "minRam": 0,
+                'server': {
+                    'id': server_uuid,
+                    "links": [{
+                        "rel": "self",
+                        "href": server_href,
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": server_bookmark,
+                    }],
+                },
+                "metadata": {
+                    "instance_uuid": server_uuid,
+                    "user_id": "fake",
+                },
+                "links": [{
+                    "rel": "self",
+                    "href": href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": bookmark,
+                },
+                {
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image",
+                    "href": alternate
+                }],
+            },
+        }
+
+        self.assertThat(actual_image, matchers.DictMatches(expected_image))
+
+    def test_get_image_with_custom_prefix(self):
+        self.flags(osapi_compute_link_prefix='https://zoo.com:42',
+                   osapi_glance_link_prefix='http://circus.com:34')
+        fake_req = fakes.HTTPRequestV3.blank('/v3/os-images/124')
+        actual_image = self.controller.show(fake_req, '124')
+        href = "https://zoo.com:42/v3/images/124"
+        bookmark = "https://zoo.com:42/images/124"
+        alternate = "http://circus.com:34/fake/images/124"
+        server_uuid = "aa640691-d1a7-4a67-9d3c-d35ee6b3cc74"
+        server_href = "https://zoo.com:42/v3/servers/" + server_uuid
+        server_bookmark = "https://zoo.com:42/servers/" + server_uuid
+
+        expected_image = {
+            "image": {
+                "id": "124",
+                "name": "queued snapshot",
+                "updated": NOW_API_FORMAT,
+                "created": NOW_API_FORMAT,
+                "status": "SAVING",
+                "progress": 25,
+                "minDisk": 0,
+                "minRam": 0,
+                'server': {
+                    'id': server_uuid,
+                    "links": [{
+                        "rel": "self",
+                        "href": server_href,
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": server_bookmark,
+                    }],
+                },
+                "metadata": {
+                    "instance_uuid": server_uuid,
+                    "user_id": "fake",
+                },
+                "links": [{
+                    "rel": "self",
+                    "href": href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": bookmark,
+                },
+                {
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image",
+                    "href": alternate
+                }],
+            },
+        }
+        self.assertThat(actual_image, matchers.DictMatches(expected_image))
+
+    def test_get_image_404(self):
+        fake_req = fakes.HTTPRequestV3.blank('/os-images/unknown')
+        self.assertRaises(webob.exc.HTTPNotFound,
+                          self.controller.show, fake_req, 'unknown')
+
+    def test_get_image_details(self):
+        request = fakes.HTTPRequestV3.blank('/os-images/detail')
+        response = self.controller.detail(request)
+        response_list = response["images"]
+
+        server_uuid = "aa640691-d1a7-4a67-9d3c-d35ee6b3cc74"
+        server_href = "http://localhost/v3/servers/" + server_uuid
+        server_bookmark = "http://localhost/servers/" + server_uuid
+        alternate = "%s/fake/images/%s"
+
+        expected = [{
+            'id': '123',
+            'name': 'public image',
+            'metadata': {'key1': 'value1'},
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'ACTIVE',
+            'progress': 100,
+            'minDisk': 10,
+            'minRam': 128,
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/123",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/123",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": alternate % (glance.generate_glance_url(), 123),
+            }],
+        },
+        {
+            'id': '124',
+            'name': 'queued snapshot',
+            'metadata': {
+                u'instance_uuid': server_uuid,
+                u'user_id': u'fake',
+            },
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'SAVING',
+            'progress': 25,
+            'minDisk': 0,
+            'minRam': 0,
+            'server': {
+                'id': server_uuid,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/124",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/124",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": alternate % (glance.generate_glance_url(), 124),
+            }],
+        },
+        {
+            'id': '125',
+            'name': 'saving snapshot',
+            'metadata': {
+                u'instance_uuid': server_uuid,
+                u'user_id': u'fake',
+            },
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'SAVING',
+            'progress': 50,
+            'minDisk': 0,
+            'minRam': 0,
+            'server': {
+                'id': server_uuid,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/125",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/125",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": "%s/fake/images/125" % glance.generate_glance_url()
+            }],
+        },
+        {
+            'id': '126',
+            'name': 'active snapshot',
+            'metadata': {
+                u'instance_uuid': server_uuid,
+                u'user_id': u'fake',
+            },
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'ACTIVE',
+            'progress': 100,
+            'minDisk': 0,
+            'minRam': 0,
+            'server': {
+                'id': server_uuid,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/126",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/126",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": "%s/fake/images/126" % glance.generate_glance_url()
+            }],
+        },
+        {
+            'id': '127',
+            'name': 'killed snapshot',
+            'metadata': {
+                u'instance_uuid': server_uuid,
+                u'user_id': u'fake',
+            },
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'ERROR',
+            'progress': 0,
+            'minDisk': 0,
+            'minRam': 0,
+            'server': {
+                'id': server_uuid,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/127",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/127",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": "%s/fake/images/127" % glance.generate_glance_url()
+            }],
+        },
+        {
+            'id': '128',
+            'name': 'deleted snapshot',
+            'metadata': {
+                u'instance_uuid': server_uuid,
+                u'user_id': u'fake',
+            },
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'DELETED',
+            'progress': 0,
+            'minDisk': 0,
+            'minRam': 0,
+            'server': {
+                'id': server_uuid,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/128",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/128",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": "%s/fake/images/128" % glance.generate_glance_url()
+            }],
+        },
+        {
+            'id': '129',
+            'name': 'pending_delete snapshot',
+            'metadata': {
+                u'instance_uuid': server_uuid,
+                u'user_id': u'fake',
+            },
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'DELETED',
+            'progress': 0,
+            'minDisk': 0,
+            'minRam': 0,
+            'server': {
+                'id': server_uuid,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/129",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/129",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": "%s/fake/images/129" % glance.generate_glance_url()
+            }],
+        },
+        {
+            'id': '130',
+            'name': None,
+            'metadata': {},
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'ACTIVE',
+            'progress': 100,
+            'minDisk': 0,
+            'minRam': 0,
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/130",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/130",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": "%s/fake/images/130" % glance.generate_glance_url()
+            }],
+        },
+        ]
+
+        self.assertThat(expected, matchers.DictListMatches(response_list))
+
+    def test_get_image_details_with_limit(self):
+        request = fakes.HTTPRequestV3.blank('/os-images/detail?limit=2')
+        response = self.controller.detail(request)
+        response_list = response["images"]
+        response_links = response["images_links"]
+
+        server_uuid = "aa640691-d1a7-4a67-9d3c-d35ee6b3cc74"
+        server_href = "http://localhost/v3/servers/" + server_uuid
+        server_bookmark = "http://localhost/servers/" + server_uuid
+        alternate = "%s/fake/images/%s"
+
+        expected = [{
+            'id': '123',
+            'name': 'public image',
+            'metadata': {'key1': 'value1'},
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'ACTIVE',
+            'minDisk': 10,
+            'progress': 100,
+            'minRam': 128,
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/123",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/123",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": alternate % (glance.generate_glance_url(), 123),
+            }],
+        },
+        {
+            'id': '124',
+            'name': 'queued snapshot',
+            'metadata': {
+                u'instance_uuid': server_uuid,
+                u'user_id': u'fake',
+            },
+            'updated': NOW_API_FORMAT,
+            'created': NOW_API_FORMAT,
+            'status': 'SAVING',
+            'minDisk': 0,
+            'progress': 25,
+            'minRam': 0,
+            'server': {
+                'id': server_uuid,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
+            "links": [{
+                "rel": "self",
+                "href": "http://localhost/v3/images/124",
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://localhost/images/124",
+            },
+            {
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image",
+                "href": alternate % (glance.generate_glance_url(), 124),
+            }],
+        }]
+
+        self.assertThat(expected, matchers.DictListMatches(response_list))
+
+        href_parts = urlparse.urlparse(response_links[0]['href'])
+        self.assertEqual('/v3/images', href_parts.path)
+        params = urlparse.parse_qs(href_parts.query)
+
+        self.assertThat({'limit': ['2'], 'marker': ['124']},
+                        matchers.DictMatches(params))
+
+    def test_image_detail_filter_with_name(self):
+        image_service = self.mox.CreateMockAnything()
+        filters = {'name': 'testname'}
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/detail'
+                                          '?name=testname')
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_filter_with_status(self):
+        image_service = self.mox.CreateMockAnything()
+        filters = {'status': 'active'}
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/detail'
+                                          '?status=ACTIVE')
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_filter_with_property(self):
+        image_service = self.mox.CreateMockAnything()
+        filters = {'property-test': '3'}
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/detail'
+                                          '?property-test=3')
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_filter_server_href(self):
+        image_service = self.mox.CreateMockAnything()
+        uuid = 'fa95aaf5-ab3b-4cd8-88c0-2be7dd051aaf'
+        ref = 'http://localhost:8774/servers/' + uuid
+        url = '/v3/os-images/detail?server=' + ref
+        filters = {'property-instance_uuid': uuid}
+        request = fakes.HTTPRequestV3.blank(url)
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_filter_server_uuid(self):
+        image_service = self.mox.CreateMockAnything()
+        uuid = 'fa95aaf5-ab3b-4cd8-88c0-2be7dd051aaf'
+        url = '/v2/fake/images/detail?server=' + uuid
+        filters = {'property-instance_uuid': uuid}
+        request = fakes.HTTPRequestV3.blank(url)
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_filter_changes_since(self):
+        image_service = self.mox.CreateMockAnything()
+        filters = {'changes-since': '2011-01-24T17:08Z'}
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/detail'
+                                          '?changes-since=2011-01-24T17:08Z')
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_filter_with_type(self):
+        image_service = self.mox.CreateMockAnything()
+        filters = {'property-image_type': 'BASE'}
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/detail?type=BASE')
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_filter_not_supported(self):
+        image_service = self.mox.CreateMockAnything()
+        filters = {'status': 'active'}
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/detail?status='
+                                          'ACTIVE&UNSUPPORTEDFILTER=testname')
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_no_filters(self):
+        image_service = self.mox.CreateMockAnything()
+        filters = {}
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/detail')
+        context = request.environ['nova.context']
+        image_service.detail(context, filters=filters).AndReturn([])
+        self.mox.ReplayAll()
+        controller = images.ImagesController(image_service=image_service)
+        controller.detail(request)
+
+    def test_image_detail_invalid_marker(self):
+        class InvalidImageService(object):
+
+            def detail(self, *args, **kwargs):
+                raise exception.Invalid('meow')
+
+        request = fakes.HTTPRequestV3.blank('/v3/os-images?marker=invalid')
+        controller = images.ImagesController(image_service=InvalidImageService())
+        self.assertRaises(webob.exc.HTTPBadRequest, controller.detail, request)
+
+    def test_generate_alternate_link(self):
+        view = images_view.ViewBuilder()
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/1')
+        generated_url = view._get_alternate_link(request, 1)
+        actual_url = "%s/fake/images/1" % glance.generate_glance_url()
+        self.assertEqual(generated_url, actual_url)
+
+    def test_delete_image(self):
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/124')
+        request.method = 'DELETE'
+        response = self.controller.delete(request, '124')
+        self.assertEqual(response.status_int, 204)
+
+    def test_delete_deleted_image(self):
+        """If you try to delete a deleted image, you get back 403 Forbidden."""
+
+        deleted_image_id = 128
+        # see nova.tests.api.openstack.fakes:_make_image_fixtures
+
+        request = fakes.HTTPRequestV3.blank(
+              '/v3/os-images/%s' % deleted_image_id)
+        request.method = 'DELETE'
+        self.assertRaises(webob.exc.HTTPForbidden, self.controller.delete,
+             request, '%s' % deleted_image_id)
+
+    def test_delete_image_not_found(self):
+        request = fakes.HTTPRequestV3.blank('/v3/os-images/300')
+        request.method = 'DELETE'
+        self.assertRaises(webob.exc.HTTPNotFound,
+                          self.controller.delete, request, '300')
+
+
+class ImageXMLSerializationTest(test.TestCase):
+
+    TIMESTAMP = "2010-10-11T10:30:22Z"
+    SERVER_UUID = 'aa640691-d1a7-4a67-9d3c-d35ee6b3cc74'
+    SERVER_HREF = 'http://localhost/v3/servers/' + SERVER_UUID
+    SERVER_BOOKMARK = 'http://localhost/servers/' + SERVER_UUID
+    IMAGE_HREF = 'http://localhost/v3/os-images/%s'
+    IMAGE_NEXT = 'http://localhost/v3/os-images?limit=%s&marker=%s'
+    IMAGE_BOOKMARK = 'http://localhost/os-images/%s'
+
+    def test_xml_declaration(self):
+        serializer = images.ImageTemplate()
+
+        fixture = {
+            'image': {
+                'id': 1,
+                'name': 'Image1',
+                'created': self.TIMESTAMP,
+                'updated': self.TIMESTAMP,
+                'status': 'ACTIVE',
+                'progress': 80,
+                'server': {
+                    'id': self.SERVER_UUID,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                'metadata': {
+                    'key1': 'value1',
+                },
+                'links': [
+                    {
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
+                        'rel': 'bookmark',
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        has_dec = output.startswith("<?xml version='1.0' encoding='UTF-8'?>")
+        self.assertTrue(has_dec)
+
+    def test_show(self):
+        serializer = images.ImageTemplate()
+
+        fixture = {
+            'image': {
+                'id': 1,
+                'name': 'Image1',
+                'created': self.TIMESTAMP,
+                'updated': self.TIMESTAMP,
+                'status': 'ACTIVE',
+                'progress': 80,
+                'minRam': 10,
+                'minDisk': 100,
+                'server': {
+                    'id': self.SERVER_UUID,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                'metadata': {
+                    'key1': 'value1',
+                },
+                'links': [
+                    {
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
+                        'rel': 'bookmark',
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'image')
+        image_dict = fixture['image']
+
+        for key in ['name', 'id', 'updated', 'created', 'status', 'progress']:
+            self.assertEqual(root.get(key), str(image_dict[key]))
+
+        link_nodes = root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+        metadata_root = root.find('{0}metadata'.format(NS))
+        metadata_elems = metadata_root.findall('{0}meta'.format(NS))
+        self.assertEqual(len(metadata_elems), 1)
+        for i, metadata_elem in enumerate(metadata_elems):
+            (meta_key, meta_value) = image_dict['metadata'].items()[i]
+            self.assertEqual(str(metadata_elem.get('key')), str(meta_key))
+            self.assertEqual(str(metadata_elem.text).strip(), str(meta_value))
+
+        server_root = root.find('{0}server'.format(NS))
+        self.assertEqual(server_root.get('id'), image_dict['server']['id'])
+        link_nodes = server_root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['server']['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_show_zero_metadata(self):
+        serializer = images.ImageTemplate()
+
+        fixture = {
+            'image': {
+                'id': 1,
+                'name': 'Image1',
+                'created': self.TIMESTAMP,
+                'updated': self.TIMESTAMP,
+                'status': 'ACTIVE',
+                'server': {
+                    'id': self.SERVER_UUID,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                'metadata': {},
+                'links': [
+                    {
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
+                        'rel': 'bookmark',
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'image')
+        image_dict = fixture['image']
+
+        for key in ['name', 'id', 'updated', 'created', 'status']:
+            self.assertEqual(root.get(key), str(image_dict[key]))
+
+        link_nodes = root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+        meta_nodes = root.findall('{0}meta'.format(ATOMNS))
+        self.assertEqual(len(meta_nodes), 0)
+
+        server_root = root.find('{0}server'.format(NS))
+        self.assertEqual(server_root.get('id'), image_dict['server']['id'])
+        link_nodes = server_root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['server']['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_show_image_no_metadata_key(self):
+        serializer = images.ImageTemplate()
+
+        fixture = {
+            'image': {
+                'id': 1,
+                'name': 'Image1',
+                'created': self.TIMESTAMP,
+                'updated': self.TIMESTAMP,
+                'status': 'ACTIVE',
+                'server': {
+                    'id': self.SERVER_UUID,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                'links': [
+                    {
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
+                        'rel': 'bookmark',
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'image')
+        image_dict = fixture['image']
+
+        for key in ['name', 'id', 'updated', 'created', 'status']:
+            self.assertEqual(root.get(key), str(image_dict[key]))
+
+        link_nodes = root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+        meta_nodes = root.findall('{0}meta'.format(ATOMNS))
+        self.assertEqual(len(meta_nodes), 0)
+
+        server_root = root.find('{0}server'.format(NS))
+        self.assertEqual(server_root.get('id'), image_dict['server']['id'])
+        link_nodes = server_root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['server']['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_show_no_server(self):
+        serializer = images.ImageTemplate()
+
+        fixture = {
+            'image': {
+                'id': 1,
+                'name': 'Image1',
+                'created': self.TIMESTAMP,
+                'updated': self.TIMESTAMP,
+                'status': 'ACTIVE',
+                'metadata': {
+                    'key1': 'value1',
+                },
+                'links': [
+                    {
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
+                        'rel': 'bookmark',
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'image')
+        image_dict = fixture['image']
+
+        for key in ['name', 'id', 'updated', 'created', 'status']:
+            self.assertEqual(root.get(key), str(image_dict[key]))
+
+        link_nodes = root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+        metadata_root = root.find('{0}metadata'.format(NS))
+        metadata_elems = metadata_root.findall('{0}meta'.format(NS))
+        self.assertEqual(len(metadata_elems), 1)
+        for i, metadata_elem in enumerate(metadata_elems):
+            (meta_key, meta_value) = image_dict['metadata'].items()[i]
+            self.assertEqual(str(metadata_elem.get('key')), str(meta_key))
+            self.assertEqual(str(metadata_elem.text).strip(), str(meta_value))
+
+        server_root = root.find('{0}server'.format(NS))
+        self.assertEqual(server_root, None)
+
+    def test_show_with_min_ram(self):
+        serializer = images.ImageTemplate()
+
+        fixture = {
+            'image': {
+                'id': 1,
+                'name': 'Image1',
+                'created': self.TIMESTAMP,
+                'updated': self.TIMESTAMP,
+                'status': 'ACTIVE',
+                'progress': 80,
+                'minRam': 256,
+                'server': {
+                    'id': self.SERVER_UUID,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                'metadata': {
+                    'key1': 'value1',
+                },
+                'links': [
+                    {
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
+                        'rel': 'bookmark',
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'image')
+        image_dict = fixture['image']
+
+        for key in ['name', 'id', 'updated', 'created', 'status', 'progress',
+                    'minRam']:
+            self.assertEqual(root.get(key), str(image_dict[key]))
+
+        link_nodes = root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+        metadata_root = root.find('{0}metadata'.format(NS))
+        metadata_elems = metadata_root.findall('{0}meta'.format(NS))
+        self.assertEqual(len(metadata_elems), 1)
+        for i, metadata_elem in enumerate(metadata_elems):
+            (meta_key, meta_value) = image_dict['metadata'].items()[i]
+            self.assertEqual(str(metadata_elem.get('key')), str(meta_key))
+            self.assertEqual(str(metadata_elem.text).strip(), str(meta_value))
+
+        server_root = root.find('{0}server'.format(NS))
+        self.assertEqual(server_root.get('id'), image_dict['server']['id'])
+        link_nodes = server_root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['server']['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_show_with_min_disk(self):
+        serializer = images.ImageTemplate()
+
+        fixture = {
+            'image': {
+                'id': 1,
+                'name': 'Image1',
+                'created': self.TIMESTAMP,
+                'updated': self.TIMESTAMP,
+                'status': 'ACTIVE',
+                'progress': 80,
+                'minDisk': 5,
+                'server': {
+                    'id': self.SERVER_UUID,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                'metadata': {
+                    'key1': 'value1',
+                },
+                'links': [
+                    {
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
+                        'rel': 'bookmark',
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'image')
+        image_dict = fixture['image']
+
+        for key in ['name', 'id', 'updated', 'created', 'status', 'progress',
+                    'minDisk']:
+            self.assertEqual(root.get(key), str(image_dict[key]))
+
+        link_nodes = root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+        metadata_root = root.find('{0}metadata'.format(NS))
+        metadata_elems = metadata_root.findall('{0}meta'.format(NS))
+        self.assertEqual(len(metadata_elems), 1)
+        for i, metadata_elem in enumerate(metadata_elems):
+            (meta_key, meta_value) = image_dict['metadata'].items()[i]
+            self.assertEqual(str(metadata_elem.get('key')), str(meta_key))
+            self.assertEqual(str(metadata_elem.text).strip(), str(meta_value))
+
+        server_root = root.find('{0}server'.format(NS))
+        self.assertEqual(server_root.get('id'), image_dict['server']['id'])
+        link_nodes = server_root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(image_dict['server']['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_index(self):
+        serializer = images.MinimalImagesTemplate()
+
+        fixture = {
+            'images': [
+                {
+                    'id': 1,
+                    'name': 'Image1',
+                    'links': [
+                        {
+                            'href': self.IMAGE_HREF % 1,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.IMAGE_BOOKMARK % 1,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                {
+                    'id': 2,
+                    'name': 'Image2',
+                    'links': [
+                        {
+                            'href': self.IMAGE_HREF % 2,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.IMAGE_BOOKMARK % 2,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+            ]
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'images_index')
+        image_elems = root.findall('{0}image'.format(NS))
+        self.assertEqual(len(image_elems), 2)
+        for i, image_elem in enumerate(image_elems):
+            image_dict = fixture['images'][i]
+
+            for key in ['name', 'id']:
+                self.assertEqual(image_elem.get(key), str(image_dict[key]))
+
+            link_nodes = image_elem.findall('{0}link'.format(ATOMNS))
+            self.assertEqual(len(link_nodes), 2)
+            for i, link in enumerate(image_dict['links']):
+                for key, value in link.items():
+                    self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_index_with_links(self):
+        serializer = images.MinimalImagesTemplate()
+
+        fixture = {
+            'images': [
+                {
+                    'id': 1,
+                    'name': 'Image1',
+                    'links': [
+                        {
+                            'href': self.IMAGE_HREF % 1,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.IMAGE_BOOKMARK % 1,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                {
+                    'id': 2,
+                    'name': 'Image2',
+                    'links': [
+                        {
+                            'href': self.IMAGE_HREF % 2,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.IMAGE_BOOKMARK % 2,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+            ],
+            'images_links': [
+                {
+                    'rel': 'next',
+                    'href': self.IMAGE_NEXT % (2, 2),
+                }
+            ],
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'images_index')
+        image_elems = root.findall('{0}image'.format(NS))
+        self.assertEqual(len(image_elems), 2)
+        for i, image_elem in enumerate(image_elems):
+            image_dict = fixture['images'][i]
+
+            for key in ['name', 'id']:
+                self.assertEqual(image_elem.get(key), str(image_dict[key]))
+
+            link_nodes = image_elem.findall('{0}link'.format(ATOMNS))
+            self.assertEqual(len(link_nodes), 2)
+            for i, link in enumerate(image_dict['links']):
+                for key, value in link.items():
+                    self.assertEqual(link_nodes[i].get(key), value)
+
+            # Check images_links
+            images_links = root.findall('{0}link'.format(ATOMNS))
+            for i, link in enumerate(fixture['images_links']):
+                for key, value in link.items():
+                    self.assertEqual(images_links[i].get(key), value)
+
+    def test_index_zero_images(self):
+        serializer = images.MinimalImagesTemplate()
+
+        fixtures = {
+            'images': [],
+        }
+
+        output = serializer.serialize(fixtures)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'images_index')
+        image_elems = root.findall('{0}image'.format(NS))
+        self.assertEqual(len(image_elems), 0)
+
+    def test_detail(self):
+        serializer = images.ImagesTemplate()
+
+        fixture = {
+            'images': [
+                {
+                    'id': 1,
+                    'name': 'Image1',
+                    'created': self.TIMESTAMP,
+                    'updated': self.TIMESTAMP,
+                    'status': 'ACTIVE',
+                    'server': {
+                        'id': self.SERVER_UUID,
+                        'links': [
+                            {
+                                'href': self.SERVER_HREF,
+                                'rel': 'self',
+                            },
+                            {
+                                'href': self.SERVER_BOOKMARK,
+                                'rel': 'bookmark',
+                            },
+                        ],
+                    },
+                    'links': [
+                        {
+                            'href': self.IMAGE_HREF % 1,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.IMAGE_BOOKMARK % 1,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+                {
+                    'id': '2',
+                    'name': 'Image2',
+                    'created': self.TIMESTAMP,
+                    'updated': self.TIMESTAMP,
+                    'status': 'SAVING',
+                    'progress': 80,
+                    'metadata': {
+                        'key1': 'value1',
+                    },
+                    'links': [
+                        {
+                            'href': self.IMAGE_HREF % 2,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.IMAGE_BOOKMARK % 2,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
+            ]
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'images')
+        image_elems = root.findall('{0}image'.format(NS))
+        self.assertEqual(len(image_elems), 2)
+        for i, image_elem in enumerate(image_elems):
+            image_dict = fixture['images'][i]
+
+            for key in ['name', 'id', 'updated', 'created', 'status']:
+                self.assertEqual(image_elem.get(key), str(image_dict[key]))
+
+            link_nodes = image_elem.findall('{0}link'.format(ATOMNS))
+            self.assertEqual(len(link_nodes), 2)
+            for i, link in enumerate(image_dict['links']):
+                for key, value in link.items():
+                    self.assertEqual(link_nodes[i].get(key), value)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py b/nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py
new file mode 100644
index 000000000..61b78fea8
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py
@@ -0,0 +1,81 @@
+# Copyright 2011 Eldar Nugaev
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from lxml import etree
+
+from nova.api.openstack import compute
+from nova.api.openstack.compute.plugins.v3 import server_diagnostics
+from nova.api.openstack import wsgi
+from nova.compute import api as compute_api
+from nova.openstack.common import jsonutils
+from nova import test
+from nova.tests.api.openstack import fakes
+
+
+UUID = 'abc'
+
+
+def fake_get_diagnostics(self, _context, instance_uuid):
+    return {'data': 'Some diagnostic info'}
+
+
+def fake_instance_get(self, _context, instance_uuid):
+    if instance_uuid != UUID:
+        raise Exception("Invalid UUID")
+    return {'uuid': instance_uuid}
+
+
+class ServerDiagnosticsTest(test.TestCase):
+
+    def setUp(self):
+        super(ServerDiagnosticsTest, self).setUp()
+        self.stubs.Set(compute_api.API, 'get_diagnostics',
+                       fake_get_diagnostics)
+        self.stubs.Set(compute_api.API, 'get', fake_instance_get)
+
+        self.router = compute.APIRouterV3(init_only=('servers', 'os-server-diagnostics'))
+
+    def test_get_diagnostics(self):
+        req = fakes.HTTPRequestV3.blank(
+            '/servers/%s/os-server-diagnostics' % UUID)
+        res = req.get_response(self.router)
+        output = jsonutils.loads(res.body)
+        self.assertEqual(output, {'data': 'Some diagnostic info'})
+
+
+class TestServerDiagnosticsXMLSerializer(test.TestCase):
+    namespace = wsgi.XMLNS_V11
+
+    def _tag(self, elem):
+        tagname = elem.tag
+        self.assertEqual(tagname[0], '{')
+        tmp = tagname.partition('}')
+        namespace = tmp[0][1:]
+        self.assertEqual(namespace, self.namespace)
+        return tmp[2]
+
+    def test_index_serializer(self):
+        serializer = server_diagnostics.ServerDiagnosticsTemplate()
+        exemplar = dict(diag1='foo', diag2='bar')
+        text = serializer.serialize(exemplar)
+
+        tree = etree.fromstring(text)
+
+        self.assertEqual('diagnostics', self._tag(tree))
+        self.assertEqual(len(tree), len(exemplar))
+        for child in tree:
+            tag = self._tag(child)
+            self.assertTrue(tag in exemplar)
+            self.assertEqual(child.text, exemplar[tag])
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index 6c30b9a9e..d0239885d 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -464,7 +464,8 @@ def stub_instance(id, user_id=None, project_id=None, host=None,
                   security_groups=None, root_device_name=None,
                   limit=None, marker=None,
                   launched_at=datetime.datetime.utcnow(),
-                  terminated_at=datetime.datetime.utcnow()):
+                  terminated_at=datetime.datetime.utcnow(),
+                  availability_zone=''):
 
     if user_id is None:
         user_id = 'fake_user'
@@ -535,7 +536,7 @@ def stub_instance(id, user_id=None, project_id=None, host=None,
         "scheduled_at": timeutils.utcnow(),
         "launched_at": launched_at,
         "terminated_at": terminated_at,
-        "availability_zone": "",
+        "availability_zone": availability_zone,
         "display_name": display_name or server_name,
         "display_description": "",
         "locked": False,
diff --git a/nova/tests/cells/test_cells_scheduler.py b/nova/tests/cells/test_cells_scheduler.py
index 46be492cc..38076fb0c 100644
--- a/nova/tests/cells/test_cells_scheduler.py
+++ b/nova/tests/cells/test_cells_scheduler.py
@@ -94,7 +94,8 @@ class CellsSchedulerTestCase(test.TestCase):
         inst_type = db.instance_type_get(self.ctxt, 1)
         image = {'properties': {}}
         instance_uuids = self.instance_uuids
-        instance_props = {'hostname': 'meow',
+        instance_props = {'name': 'instance-00000001',
+                          'hostname': 'meow',
                           'display_name': 'moo',
                           'image_ref': 'fake_image_ref',
                           'user_id': self.ctxt.user_id,
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 21d9db54b..2ac8b22b8 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -1088,6 +1088,103 @@ class ComputeTestCase(BaseTestCase):
         self._assert_state({'vm_state': vm_states.ERROR,
                             'task_state': None})
 
+    def test_allocate_network_succeeds_after_retries(self):
+        # Undo setUp() stubs as this is a true unit test
+        self.stubs.UnsetAll()
+        self.flags(network_allocate_retries=8)
+
+        nwapi = self.compute.network_api
+        self.mox.StubOutWithMock(nwapi, 'allocate_for_instance')
+        self.mox.StubOutWithMock(time, 'sleep')
+
+        instance = {}
+        is_vpn = 'fake-is-vpn'
+        req_networks = 'fake-req-networks'
+        macs = 'fake-macs'
+        sec_groups = 'fake-sec-groups'
+        final_result = 'meow'
+
+        expected_sleep_times = [1, 2, 4, 8, 16, 30, 30, 30]
+
+        for sleep_time in expected_sleep_times:
+            nwapi.allocate_for_instance(
+                    self.context, instance, vpn=is_vpn,
+                    requested_networks=req_networks, macs=macs,
+                    conductor_api=self.compute.conductor_api,
+                    security_groups=sec_groups).AndRaise(
+                            test.TestingException())
+            time.sleep(sleep_time)
+
+        nwapi.allocate_for_instance(
+                self.context, instance, vpn=is_vpn,
+                requested_networks=req_networks, macs=macs,
+                conductor_api=self.compute.conductor_api,
+                security_groups=sec_groups).AndReturn(final_result)
+
+        self.mox.ReplayAll()
+
+        res = self.compute._allocate_network_async(self.context, instance,
+                                                   req_networks,
+                                                   macs,
+                                                   sec_groups,
+                                                   is_vpn)
+        self.assertEqual(final_result, res)
+
+    def test_allocate_network_fails(self):
+        # Undo setUp() stubs as this is a true unit test
+        self.stubs.UnsetAll()
+        self.flags(network_allocate_retries=0)
+
+        nwapi = self.compute.network_api
+        self.mox.StubOutWithMock(nwapi, 'allocate_for_instance')
+
+        instance = {}
+        is_vpn = 'fake-is-vpn'
+        req_networks = 'fake-req-networks'
+        macs = 'fake-macs'
+        sec_groups = 'fake-sec-groups'
+
+        nwapi.allocate_for_instance(
+                self.context, instance, vpn=is_vpn,
+                requested_networks=req_networks, macs=macs,
+                conductor_api=self.compute.conductor_api,
+                security_groups=sec_groups).AndRaise(test.TestingException())
+
+        self.mox.ReplayAll()
+
+        self.assertRaises(test.TestingException,
+                          self.compute._allocate_network_async,
+                          self.context, instance, req_networks, macs,
+                          sec_groups, is_vpn)
+
+    def test_allocate_network_neg_conf_value_treated_as_zero(self):
+        # Undo setUp() stubs as this is a true unit test
+        self.stubs.UnsetAll()
+        self.flags(network_allocate_retries=-1)
+
+        nwapi = self.compute.network_api
+        self.mox.StubOutWithMock(nwapi, 'allocate_for_instance')
+
+        instance = {}
+        is_vpn = 'fake-is-vpn'
+        req_networks = 'fake-req-networks'
+        macs = 'fake-macs'
+        sec_groups = 'fake-sec-groups'
+
+        # Only attempted once.
+        nwapi.allocate_for_instance(
+                self.context, instance, vpn=is_vpn,
+                requested_networks=req_networks, macs=macs,
+                conductor_api=self.compute.conductor_api,
+                security_groups=sec_groups).AndRaise(test.TestingException())
+
+        self.mox.ReplayAll()
+
+        self.assertRaises(test.TestingException,
+                          self.compute._allocate_network_async,
+                          self.context, instance, req_networks, macs,
+                          sec_groups, is_vpn)
+
     def test_run_instance_dealloc_network_instance_not_found(self):
         """spawn network deallocate test.
 
@@ -5124,7 +5221,8 @@ class ComputeTestCase(BaseTestCase):
 
         self.mox.ReplayAll()
 
-        result = self.compute._get_instances_on_driver(fake_context)
+        result = self.compute._get_instances_on_driver(fake_context,
+                                                       columns_to_join=[])
         self.assertEqual(driver_instances, result)
 
     def test_get_instances_on_driver_fallback(self):
@@ -5155,7 +5253,7 @@ class ComputeTestCase(BaseTestCase):
                 [inst['name'] for inst in driver_instances])
         self.compute.conductor_api.instance_get_all_by_filters(
                 fake_context, filters,
-                columns_to_join=[]).AndReturn(all_instances)
+                columns_to_join=None).AndReturn(all_instances)
 
         self.mox.ReplayAll()
 
diff --git a/nova/tests/db/test_db_api.py b/nova/tests/db/test_db_api.py
index 2baa7ee3a..15ef5c3c1 100644
--- a/nova/tests/db/test_db_api.py
+++ b/nova/tests/db/test_db_api.py
@@ -121,215 +121,20 @@ class DbTestCase(test.TestCase):
 
 
 class DbApiTestCase(DbTestCase):
-    def test_create_instance_unique_hostname(self):
-        otherprojectcontext = context.RequestContext(self.user_id,
-                                          "%s2" % self.project_id)
-
-        self.create_instance_with_args(hostname='fake_name')
-
-        # With scope 'global' any duplicate should fail, be it this project:
-        self.flags(osapi_compute_unique_server_name_scope='global')
-        self.assertRaises(exception.InstanceExists,
-                          self.create_instance_with_args,
-                          hostname='fake_name')
-
-        # or another:
-        self.assertRaises(exception.InstanceExists,
-                          self.create_instance_with_args,
-                          context=otherprojectcontext,
-                          hostname='fake_name')
-
-        # With scope 'project' a duplicate in the project should fail:
-        self.flags(osapi_compute_unique_server_name_scope='project')
-        self.assertRaises(exception.InstanceExists,
-                          self.create_instance_with_args,
-                          hostname='fake_name')
-
-        # With scope 'project' a duplicate in a different project should work:
-        self.flags(osapi_compute_unique_server_name_scope='project')
-        self.create_instance_with_args(context=otherprojectcontext,
-                                       hostname='fake_name')
-
-        self.flags(osapi_compute_unique_server_name_scope=None)
 
     def test_ec2_ids_not_found_are_printable(self):
-        def check_exc_format(method):
+        def check_exc_format(method, value):
             try:
-                method(self.context, 'fake')
+                method(self.context, value)
             except exception.NotFound as exc:
-                self.assertTrue('fake' in unicode(exc))
-
-        check_exc_format(db.get_ec2_volume_id_by_uuid)
-        check_exc_format(db.get_volume_uuid_by_ec2_id)
-        check_exc_format(db.get_ec2_snapshot_id_by_uuid)
-        check_exc_format(db.get_snapshot_uuid_by_ec2_id)
-        check_exc_format(db.get_ec2_instance_id_by_uuid)
-        check_exc_format(db.get_instance_uuid_by_ec2_id)
+                self.assertTrue(unicode(value) in unicode(exc))
 
-    def test_instance_get_all_with_meta(self):
-        inst = self.create_instance_with_args()
-        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
-        result = db.instance_get_all(self.context)
-        for inst in result:
-            meta = utils.metadata_to_dict(inst['metadata'])
-            self.assertEqual(meta, fake_meta)
-            sys_meta = utils.metadata_to_dict(inst['system_metadata'])
-            self.assertEqual(sys_meta, fake_sys)
-
-    def test_instance_get_all_by_filters_with_meta(self):
-        inst = self.create_instance_with_args()
-        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
-        result = db.instance_get_all_by_filters(self.context, {})
-        for inst in result:
-            meta = utils.metadata_to_dict(inst['metadata'])
-            self.assertEqual(meta, fake_meta)
-            sys_meta = utils.metadata_to_dict(inst['system_metadata'])
-            self.assertEqual(sys_meta, fake_sys)
-
-    def test_instance_get_all_by_filters_without_meta(self):
-        inst = self.create_instance_with_args()
-        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
-        result = db.instance_get_all_by_filters(self.context, {},
-                                                columns_to_join=[])
-        for inst in result:
-            meta = utils.metadata_to_dict(inst['metadata'])
-            self.assertEqual(meta, {})
-            sys_meta = utils.metadata_to_dict(inst['system_metadata'])
-            self.assertEqual(sys_meta, {})
-
-    def test_instance_get_all_by_filters(self):
-        self.create_instance_with_args()
-        self.create_instance_with_args()
-        result = db.instance_get_all_by_filters(self.context, {})
-        self.assertEqual(2, len(result))
-
-    def test_instance_get_all_by_filters_regex(self):
-        self.create_instance_with_args(display_name='test1')
-        self.create_instance_with_args(display_name='teeeest2')
-        self.create_instance_with_args(display_name='diff')
-        result = db.instance_get_all_by_filters(self.context,
-                                                {'display_name': 't.*st.'})
-        self.assertEqual(2, len(result))
-
-    def test_instance_get_all_by_filters_exact_match(self):
-        self.create_instance_with_args(host='host1')
-        self.create_instance_with_args(host='host12')
-        result = db.instance_get_all_by_filters(self.context,
-                                                {'host': 'host1'})
-        self.assertEqual(1, len(result))
-
-    def test_instance_get_all_by_filters_metadata(self):
-        self.create_instance_with_args(metadata={'foo': 'bar'})
-        self.create_instance_with_args()
-        result = db.instance_get_all_by_filters(self.context,
-                                                {'metadata': {'foo': 'bar'}})
-        self.assertEqual(1, len(result))
-
-    def test_instance_get_all_by_filters_unicode_value(self):
-        self.create_instance_with_args(display_name=u'test♥')
-        result = db.instance_get_all_by_filters(self.context,
-                                                {'display_name': u'test'})
-        self.assertEqual(1, len(result))
-
-    def test_instance_get_by_uuid(self):
-        inst = self.create_instance_with_args()
-        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
-        result = db.instance_get_by_uuid(self.context, inst['uuid'])
-        meta = utils.metadata_to_dict(result['metadata'])
-        self.assertEqual(meta, fake_meta)
-        sys_meta = utils.metadata_to_dict(result['system_metadata'])
-        self.assertEqual(sys_meta, fake_sys)
-
-    def test_instance_get_by_uuid_join_empty(self):
-        inst = self.create_instance_with_args()
-        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
-        result = db.instance_get_by_uuid(self.context, inst['uuid'],
-                columns_to_join=[])
-        meta = utils.metadata_to_dict(result['metadata'])
-        self.assertEqual(meta, {})
-        sys_meta = utils.metadata_to_dict(result['system_metadata'])
-        self.assertEqual(sys_meta, {})
-
-    def test_instance_get_by_uuid_join_meta(self):
-        inst = self.create_instance_with_args()
-        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
-        result = db.instance_get_by_uuid(self.context, inst['uuid'],
-                columns_to_join=['metadata'])
-        meta = utils.metadata_to_dict(result['metadata'])
-        self.assertEqual(meta, fake_meta)
-        sys_meta = utils.metadata_to_dict(result['system_metadata'])
-        self.assertEqual(sys_meta, {})
-
-    def test_instance_get_by_uuid_join_sys_meta(self):
-        inst = self.create_instance_with_args()
-        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
-        result = db.instance_get_by_uuid(self.context, inst['uuid'],
-                columns_to_join=['system_metadata'])
-        meta = utils.metadata_to_dict(result['metadata'])
-        self.assertEqual(meta, {})
-        sys_meta = utils.metadata_to_dict(result['system_metadata'])
-        self.assertEqual(sys_meta, fake_sys)
-
-    def test_instance_get_all_by_filters_deleted(self):
-        inst1 = self.create_instance_with_args()
-        inst2 = self.create_instance_with_args(reservation_id='b')
-        db.instance_destroy(self.context, inst1['uuid'])
-        result = db.instance_get_all_by_filters(self.context, {})
-        self.assertEqual(2, len(result))
-        self.assertIn(inst1['id'], [result[0]['id'], result[1]['id']])
-        self.assertIn(inst2['id'], [result[0]['id'], result[1]['id']])
-        if inst1['id'] == result[0]['id']:
-            self.assertTrue(result[0]['deleted'])
-        else:
-            self.assertTrue(result[1]['deleted'])
-
-    def test_instance_get_all_by_filters_deleted_and_soft_deleted(self):
-        inst1 = self.create_instance_with_args()
-        inst2 = self.create_instance_with_args(vm_state=vm_states.SOFT_DELETED)
-        self.create_instance_with_args()
-        db.instance_destroy(self.context, inst1['uuid'])
-        result = db.instance_get_all_by_filters(self.context,
-                                                {'deleted': True})
-        self.assertEqual(2, len(result))
-        self.assertIn(inst1['id'], [result[0]['id'], result[1]['id']])
-        self.assertIn(inst2['id'], [result[0]['id'], result[1]['id']])
-
-    def test_instance_get_all_by_filters_deleted_no_soft_deleted(self):
-        inst1 = self.create_instance_with_args()
-        self.create_instance_with_args(vm_state=vm_states.SOFT_DELETED)
-        self.create_instance_with_args()
-        db.instance_destroy(self.context, inst1['uuid'])
-        result = db.instance_get_all_by_filters(self.context,
-                                                {'deleted': True,
-                                                 'soft_deleted': False})
-        self.assertEqual(1, len(result))
-        self.assertEqual(inst1['id'], result[0]['id'])
-
-    def test_instance_get_all_by_filters_alive_and_soft_deleted(self):
-        inst1 = self.create_instance_with_args()
-        inst2 = self.create_instance_with_args(vm_state=vm_states.SOFT_DELETED)
-        inst3 = self.create_instance_with_args()
-        db.instance_destroy(self.context, inst1['uuid'])
-        result = db.instance_get_all_by_filters(self.context,
-                                                {'deleted': False,
-                                                 'soft_deleted': True})
-        self.assertEqual(2, len(result))
-        self.assertIn(inst2['id'], [result[0]['id'], result[1]['id']])
-        self.assertIn(inst3['id'], [result[0]['id'], result[1]['id']])
-
-    def test_instance_get_all_by_host_and_node_no_join(self):
-        # Test that system metadata is not joined.
-        sys_meta = {'foo': 'bar'}
-        expected = self.create_instance_with_args(system_metadata=sys_meta)
-
-        elevated = self.context.elevated()
-        instances = db.instance_get_all_by_host_and_node(elevated, 'host1',
-                                                         'node1')
-        self.assertEqual(1, len(instances))
-        instance = instances[0]
-        self.assertEqual(expected['uuid'], instance['uuid'])
-        sysmeta = dict(instance)['system_metadata']
-        self.assertEqual(len(sysmeta), 0)
+        check_exc_format(db.get_ec2_volume_id_by_uuid, 'fake')
+        check_exc_format(db.get_volume_uuid_by_ec2_id, 123456)
+        check_exc_format(db.get_ec2_snapshot_id_by_uuid, 'fake')
+        check_exc_format(db.get_snapshot_uuid_by_ec2_id, 123456)
+        check_exc_format(db.get_ec2_instance_id_by_uuid, 'fake')
+        check_exc_format(db.get_instance_uuid_by_ec2_id, 123456)
 
     def test_migration_get_unconfirmed_by_dest_compute(self):
         ctxt = context.get_admin_context()
@@ -370,206 +175,6 @@ class DbApiTestCase(DbTestCase):
         self.assertEqual(0, len(results))
         db.migration_update(ctxt, migration['id'], {"status": "CONFIRMED"})
 
-    def test_instance_get_all_hung_in_rebooting(self):
-        ctxt = context.get_admin_context()
-
-        # Ensure no instances are returned.
-        results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
-        self.assertEqual(0, len(results))
-
-        # Ensure one rebooting instance with updated_at older than 10 seconds
-        # is returned.
-        updated_at = datetime.datetime(2000, 1, 1, 12, 0, 0)
-        values = {"task_state": "rebooting", "updated_at": updated_at}
-        instance = db.instance_create(ctxt, values)
-        results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
-        self.assertEqual(1, len(results))
-        db.instance_update(ctxt, instance['uuid'], {"task_state": None})
-
-        # Ensure the newly rebooted instance is not returned.
-        updated_at = timeutils.utcnow()
-        values = {"task_state": "rebooting", "updated_at": updated_at}
-        instance = db.instance_create(ctxt, values)
-        results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
-        self.assertEqual(0, len(results))
-        db.instance_update(ctxt, instance['uuid'], {"task_state": None})
-
-    def test_instance_update_with_expected_vm_state(self):
-        ctxt = context.get_admin_context()
-        uuid = uuidutils.generate_uuid()
-        updates = {'expected_vm_state': 'meow',
-                   'moo': 'cow'}
-
-        class FakeInstance(dict):
-            def save(self, session=None):
-                pass
-
-        fake_instance_values = {'vm_state': 'meow',
-                                'hostname': '',
-                                'metadata': None,
-                                'system_metadata': None}
-        fake_instance = FakeInstance(fake_instance_values)
-
-        self.mox.StubOutWithMock(sqlalchemy_api, '_instance_get_by_uuid')
-        self.mox.StubOutWithMock(fake_instance, 'save')
-
-        sqlalchemy_api._instance_get_by_uuid(ctxt, uuid,
-                session=mox.IgnoreArg()).AndReturn(fake_instance)
-        fake_instance.save(session=mox.IgnoreArg())
-
-        self.mox.ReplayAll()
-
-        result = db.instance_update(ctxt, uuid, updates)
-        expected_instance = dict(fake_instance_values)
-        expected_instance['moo'] = 'cow'
-        self.assertEqual(expected_instance, result)
-
-    def test_instance_update_with_unexpected_vm_state(self):
-        ctxt = context.get_admin_context()
-        uuid = uuidutils.generate_uuid()
-        updates = {'expected_vm_state': 'meow'}
-        fake_instance = {'vm_state': 'nomatch'}
-
-        self.mox.StubOutWithMock(sqlalchemy_api, '_instance_get_by_uuid')
-
-        sqlalchemy_api._instance_get_by_uuid(ctxt, uuid,
-                session=mox.IgnoreArg()).AndReturn(fake_instance)
-
-        self.mox.ReplayAll()
-
-        self.assertRaises(exception.UnexpectedVMStateError,
-                          db.instance_update, ctxt, uuid, updates)
-
-    def test_instance_update_with_instance_uuid(self):
-        # test instance_update() works when an instance UUID is passed.
-        ctxt = context.get_admin_context()
-
-        # Create an instance with some metadata
-        values = {'metadata': {'host': 'foo', 'key1': 'meow'},
-                  'system_metadata': {'original_image_ref': 'blah'}}
-        instance = db.instance_create(ctxt, values)
-
-        # Update the metadata
-        values = {'metadata': {'host': 'bar', 'key2': 'wuff'},
-                  'system_metadata': {'original_image_ref': 'baz'}}
-        db.instance_update(ctxt, instance['uuid'], values)
-
-        # Retrieve the user-provided metadata to ensure it was successfully
-        # updated
-        instance_meta = db.instance_metadata_get(ctxt, instance['uuid'])
-        self.assertEqual('bar', instance_meta['host'])
-        self.assertEqual('wuff', instance_meta['key2'])
-        self.assertNotIn('key1', instance_meta)
-
-        # Retrieve the system metadata to ensure it was successfully updated
-        system_meta = db.instance_system_metadata_get(ctxt, instance['uuid'])
-        self.assertEqual('baz', system_meta['original_image_ref'])
-
-    def test_delete_instance_metadata_on_instance_destroy(self):
-        ctxt = context.get_admin_context()
-
-        # Create an instance with some metadata
-        values = {'metadata': {'host': 'foo', 'key1': 'meow'},
-                  'system_metadata': {'original_image_ref': 'blah'}}
-        instance = db.instance_create(ctxt, values)
-        instance_meta = db.instance_metadata_get(ctxt, instance['uuid'])
-        self.assertEqual('foo', instance_meta['host'])
-        self.assertEqual('meow', instance_meta['key1'])
-        db.instance_destroy(ctxt, instance['uuid'])
-        instance_meta = db.instance_metadata_get(ctxt, instance['uuid'])
-        # Make sure instance metadata is deleted as well
-        self.assertEqual({}, instance_meta)
-
-    def test_instance_update_unique_name(self):
-        otherprojectcontext = context.RequestContext(self.user_id,
-                                          "%s2" % self.project_id)
-
-        inst = self.create_instance_with_args(hostname='fake_name')
-        uuid1p1 = inst['uuid']
-        inst = self.create_instance_with_args(hostname='fake_name2')
-        uuid2p1 = inst['uuid']
-
-        inst = self.create_instance_with_args(context=otherprojectcontext,
-                                               hostname='fake_name3')
-        uuid1p2 = inst['uuid']
-
-        # osapi_compute_unique_server_name_scope is unset so this should work:
-        values = {'hostname': 'fake_name2'}
-        db.instance_update(self.context, uuid1p1, values)
-        values = {'hostname': 'fake_name'}
-        db.instance_update(self.context, uuid1p1, values)
-
-        # With scope 'global' any duplicate should fail.
-        self.flags(osapi_compute_unique_server_name_scope='global')
-        self.assertRaises(exception.InstanceExists,
-                          db.instance_update,
-                          self.context,
-                          uuid2p1,
-                          values)
-
-        self.assertRaises(exception.InstanceExists,
-                          db.instance_update,
-                          otherprojectcontext,
-                          uuid1p2,
-                          values)
-
-        # But we should definitely be able to update our name if we aren't
-        #  really changing it.
-        case_only_values = {'hostname': 'fake_NAME'}
-        db.instance_update(self.context, uuid1p1, case_only_values)
-
-        # With scope 'project' a duplicate in the project should fail:
-        self.flags(osapi_compute_unique_server_name_scope='project')
-        self.assertRaises(exception.InstanceExists,
-                          db.instance_update,
-                          self.context,
-                          uuid2p1,
-                          values)
-
-        # With scope 'project' a duplicate in a different project should work:
-        self.flags(osapi_compute_unique_server_name_scope='project')
-        db.instance_update(otherprojectcontext, uuid1p2, values)
-
-    def test_instance_update_with_and_get_original(self):
-        ctxt = context.get_admin_context()
-
-        # Create an instance with some metadata
-        values = {'vm_state': 'building'}
-        instance = db.instance_create(ctxt, values)
-
-        (old_ref, new_ref) = db.instance_update_and_get_original(ctxt,
-                instance['uuid'], {'vm_state': 'needscoffee'})
-        self.assertEquals("building", old_ref["vm_state"])
-        self.assertEquals("needscoffee", new_ref["vm_state"])
-
-    def _test_instance_update_updates_metadata(self, metadata_type):
-        ctxt = context.get_admin_context()
-
-        instance = db.instance_create(ctxt, {})
-
-        def set_and_check(meta):
-            inst = db.instance_update(ctxt, instance['uuid'],
-                               {metadata_type: dict(meta)})
-            _meta = utils.metadata_to_dict(inst[metadata_type])
-            self.assertEqual(meta, _meta)
-
-        meta = {'speed': '88', 'units': 'MPH'}
-        set_and_check(meta)
-
-        meta['gigawatts'] = '1.21'
-        set_and_check(meta)
-
-        del meta['gigawatts']
-        set_and_check(meta)
-
-    def test_instance_update_updates_system_metadata(self):
-        # Ensure that system_metadata is updated during instance_update
-        self._test_instance_update_updates_metadata('system_metadata')
-
-    def test_instance_update_updates_metadata(self):
-        # Ensure that metadata is updated during instance_update
-        self._test_instance_update_updates_metadata('metadata')
-
     def test_add_key_pair(self, name=None):
         """Check if keypair creation work as expected."""
         keypair = {
@@ -643,34 +248,6 @@ class DbApiTestCase(DbTestCase):
         db.dnsdomain_unregister(ctxt, domain1)
         db.dnsdomain_unregister(ctxt, domain2)
 
-    def test_instance_floating_address_get_all(self):
-        ctxt = context.get_admin_context()
-
-        instance1 = db.instance_create(ctxt, {'host': 'h1', 'hostname': 'n1'})
-        instance2 = db.instance_create(ctxt, {'host': 'h2', 'hostname': 'n2'})
-
-        fixed_addresses = ['1.1.1.1', '1.1.1.2', '1.1.1.3']
-        float_addresses = ['2.1.1.1', '2.1.1.2', '2.1.1.3']
-        instance_uuids = [instance1['uuid'], instance1['uuid'],
-                          instance2['uuid']]
-
-        for fixed_addr, float_addr, instance_uuid in zip(fixed_addresses,
-                                                         float_addresses,
-                                                         instance_uuids):
-            db.fixed_ip_create(ctxt, {'address': fixed_addr,
-                                      'instance_uuid': instance_uuid})
-            fixed_id = db.fixed_ip_get_by_address(ctxt, fixed_addr)['id']
-            db.floating_ip_create(ctxt,
-                                  {'address': float_addr,
-                                   'fixed_ip_id': fixed_id})
-
-        real_float_addresses = \
-                db.instance_floating_address_get_all(ctxt, instance_uuids[0])
-        self.assertEqual(set(float_addresses[:2]), set(real_float_addresses))
-        real_float_addresses = \
-                db.instance_floating_address_get_all(ctxt, instance_uuids[2])
-        self.assertEqual(set([float_addresses[2]]), set(real_float_addresses))
-
     def test_get_vol_mapping_non_admin(self):
         ref = db.ec2_volume_create(self.context, 'fake-uuid')
         ec2_id = db.get_ec2_volume_id_by_uuid(self.context, 'fake-uuid')
@@ -1782,6 +1359,438 @@ class SecurityGroupTestCase(test.TestCase, ModelsObjectComparatorMixin):
                                                  'default'))
 
 
+class InstanceTestCase(DbTestCase):
+
+    """Tests for db.api.instance_* methods."""
+
+    def setUp(self):
+        super(InstanceTestCase, self).setUp()
+
+    def test_create_instance_unique_hostname(self):
+        otherprojectcontext = context.RequestContext(self.user_id,
+                                          "%s2" % self.project_id)
+
+        self.create_instance_with_args(hostname='fake_name')
+
+        # With scope 'global' any duplicate should fail, be it this project:
+        self.flags(osapi_compute_unique_server_name_scope='global')
+        self.assertRaises(exception.InstanceExists,
+                          self.create_instance_with_args,
+                          hostname='fake_name')
+
+        # or another:
+        self.assertRaises(exception.InstanceExists,
+                          self.create_instance_with_args,
+                          context=otherprojectcontext,
+                          hostname='fake_name')
+
+        # With scope 'project' a duplicate in the project should fail:
+        self.flags(osapi_compute_unique_server_name_scope='project')
+        self.assertRaises(exception.InstanceExists,
+                          self.create_instance_with_args,
+                          hostname='fake_name')
+
+        # With scope 'project' a duplicate in a different project should work:
+        self.flags(osapi_compute_unique_server_name_scope='project')
+        self.create_instance_with_args(context=otherprojectcontext,
+                                       hostname='fake_name')
+
+        self.flags(osapi_compute_unique_server_name_scope=None)
+
+    def test_instance_get_all_with_meta(self):
+        inst = self.create_instance_with_args()
+        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
+        result = db.instance_get_all(self.context)
+        for inst in result:
+            meta = utils.metadata_to_dict(inst['metadata'])
+            self.assertEqual(meta, fake_meta)
+            sys_meta = utils.metadata_to_dict(inst['system_metadata'])
+            self.assertEqual(sys_meta, fake_sys)
+
+    def test_instance_get_all_by_filters_with_meta(self):
+        inst = self.create_instance_with_args()
+        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
+        result = db.instance_get_all_by_filters(self.context, {})
+        for inst in result:
+            meta = utils.metadata_to_dict(inst['metadata'])
+            self.assertEqual(meta, fake_meta)
+            sys_meta = utils.metadata_to_dict(inst['system_metadata'])
+            self.assertEqual(sys_meta, fake_sys)
+
+    def test_instance_get_all_by_filters_without_meta(self):
+        inst = self.create_instance_with_args()
+        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
+        result = db.instance_get_all_by_filters(self.context, {},
+                                                columns_to_join=[])
+        for inst in result:
+            meta = utils.metadata_to_dict(inst['metadata'])
+            self.assertEqual(meta, {})
+            sys_meta = utils.metadata_to_dict(inst['system_metadata'])
+            self.assertEqual(sys_meta, {})
+
+    def test_instance_get_all_by_filters(self):
+        self.create_instance_with_args()
+        self.create_instance_with_args()
+        result = db.instance_get_all_by_filters(self.context, {})
+        self.assertEqual(2, len(result))
+
+    def test_instance_get_all_by_filters_regex(self):
+        self.create_instance_with_args(display_name='test1')
+        self.create_instance_with_args(display_name='teeeest2')
+        self.create_instance_with_args(display_name='diff')
+        result = db.instance_get_all_by_filters(self.context,
+                                                {'display_name': 't.*st.'})
+        self.assertEqual(2, len(result))
+
+    def test_instance_get_all_by_filters_exact_match(self):
+        self.create_instance_with_args(host='host1')
+        self.create_instance_with_args(host='host12')
+        result = db.instance_get_all_by_filters(self.context,
+                                                {'host': 'host1'})
+        self.assertEqual(1, len(result))
+
+    def test_instance_get_all_by_filters_metadata(self):
+        self.create_instance_with_args(metadata={'foo': 'bar'})
+        self.create_instance_with_args()
+        result = db.instance_get_all_by_filters(self.context,
+                                                {'metadata': {'foo': 'bar'}})
+        self.assertEqual(1, len(result))
+
+    def test_instance_get_all_by_filters_unicode_value(self):
+        self.create_instance_with_args(display_name=u'test♥')
+        result = db.instance_get_all_by_filters(self.context,
+                                                {'display_name': u'test'})
+        self.assertEqual(1, len(result))
+
+    def test_instance_get_by_uuid(self):
+        inst = self.create_instance_with_args()
+        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
+        result = db.instance_get_by_uuid(self.context, inst['uuid'])
+        meta = utils.metadata_to_dict(result['metadata'])
+        self.assertEqual(meta, fake_meta)
+        sys_meta = utils.metadata_to_dict(result['system_metadata'])
+        self.assertEqual(sys_meta, fake_sys)
+
+    def test_instance_get_by_uuid_join_empty(self):
+        inst = self.create_instance_with_args()
+        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
+        result = db.instance_get_by_uuid(self.context, inst['uuid'],
+                columns_to_join=[])
+        meta = utils.metadata_to_dict(result['metadata'])
+        self.assertEqual(meta, {})
+        sys_meta = utils.metadata_to_dict(result['system_metadata'])
+        self.assertEqual(sys_meta, {})
+
+    def test_instance_get_by_uuid_join_meta(self):
+        inst = self.create_instance_with_args()
+        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
+        result = db.instance_get_by_uuid(self.context, inst['uuid'],
+                columns_to_join=['metadata'])
+        meta = utils.metadata_to_dict(result['metadata'])
+        self.assertEqual(meta, fake_meta)
+        sys_meta = utils.metadata_to_dict(result['system_metadata'])
+        self.assertEqual(sys_meta, {})
+
+    def test_instance_get_by_uuid_join_sys_meta(self):
+        inst = self.create_instance_with_args()
+        fake_meta, fake_sys = self.create_metadata_for_instance(inst['uuid'])
+        result = db.instance_get_by_uuid(self.context, inst['uuid'],
+                columns_to_join=['system_metadata'])
+        meta = utils.metadata_to_dict(result['metadata'])
+        self.assertEqual(meta, {})
+        sys_meta = utils.metadata_to_dict(result['system_metadata'])
+        self.assertEqual(sys_meta, fake_sys)
+
+    def test_instance_get_all_by_filters_deleted(self):
+        inst1 = self.create_instance_with_args()
+        inst2 = self.create_instance_with_args(reservation_id='b')
+        db.instance_destroy(self.context, inst1['uuid'])
+        result = db.instance_get_all_by_filters(self.context, {})
+        self.assertEqual(2, len(result))
+        self.assertIn(inst1['id'], [result[0]['id'], result[1]['id']])
+        self.assertIn(inst2['id'], [result[0]['id'], result[1]['id']])
+        if inst1['id'] == result[0]['id']:
+            self.assertTrue(result[0]['deleted'])
+        else:
+            self.assertTrue(result[1]['deleted'])
+
+    def test_instance_get_all_by_filters_deleted_and_soft_deleted(self):
+        inst1 = self.create_instance_with_args()
+        inst2 = self.create_instance_with_args(vm_state=vm_states.SOFT_DELETED)
+        inst3 = self.create_instance_with_args()
+        db.instance_destroy(self.context, inst1['uuid'])
+        result = db.instance_get_all_by_filters(self.context,
+                                                {'deleted': True})
+        self.assertEqual(2, len(result))
+        self.assertIn(inst1['id'], [result[0]['id'], result[1]['id']])
+        self.assertIn(inst2['id'], [result[0]['id'], result[1]['id']])
+
+    def test_instance_get_all_by_filters_deleted_no_soft_deleted(self):
+        inst1 = self.create_instance_with_args()
+        inst2 = self.create_instance_with_args(vm_state=vm_states.SOFT_DELETED)
+        inst3 = self.create_instance_with_args()
+        db.instance_destroy(self.context, inst1['uuid'])
+        result = db.instance_get_all_by_filters(self.context,
+                                                {'deleted': True,
+                                                 'soft_deleted': False})
+        self.assertEqual(1, len(result))
+        self.assertEqual(inst1['id'], result[0]['id'])
+
+    def test_instance_get_all_by_filters_alive_and_soft_deleted(self):
+        inst1 = self.create_instance_with_args()
+        inst2 = self.create_instance_with_args(vm_state=vm_states.SOFT_DELETED)
+        inst3 = self.create_instance_with_args()
+        db.instance_destroy(self.context, inst1['uuid'])
+        result = db.instance_get_all_by_filters(self.context,
+                                                {'deleted': False,
+                                                 'soft_deleted': True})
+        self.assertEqual(2, len(result))
+        self.assertIn(inst2['id'], [result[0]['id'], result[1]['id']])
+        self.assertIn(inst3['id'], [result[0]['id'], result[1]['id']])
+
+    def test_instance_get_all_by_host_and_node_no_join(self):
+        # Test that system metadata is not joined.
+        sys_meta = {'foo': 'bar'}
+        expected = self.create_instance_with_args(system_metadata=sys_meta)
+
+        elevated = self.context.elevated()
+        instances = db.instance_get_all_by_host_and_node(elevated, 'host1',
+                                                         'node1')
+        self.assertEqual(1, len(instances))
+        instance = instances[0]
+        self.assertEqual(expected['uuid'], instance['uuid'])
+        sysmeta = dict(instance)['system_metadata']
+        self.assertEqual(len(sysmeta), 0)
+
+    def test_instance_get_all_hung_in_rebooting(self):
+        ctxt = context.get_admin_context()
+
+        # Ensure no instances are returned.
+        results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
+        self.assertEqual(0, len(results))
+
+        # Ensure one rebooting instance with updated_at older than 10 seconds
+        # is returned.
+        updated_at = datetime.datetime(2000, 1, 1, 12, 0, 0)
+        values = {"task_state": "rebooting", "updated_at": updated_at}
+        instance = db.instance_create(ctxt, values)
+        results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
+        self.assertEqual(1, len(results))
+        db.instance_update(ctxt, instance['uuid'], {"task_state": None})
+
+        # Ensure the newly rebooted instance is not returned.
+        updated_at = timeutils.utcnow()
+        values = {"task_state": "rebooting", "updated_at": updated_at}
+        instance = db.instance_create(ctxt, values)
+        results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
+        self.assertEqual(0, len(results))
+        db.instance_update(ctxt, instance['uuid'], {"task_state": None})
+
+    def test_instance_update_with_expected_vm_state(self):
+        ctxt = context.get_admin_context()
+        uuid = uuidutils.generate_uuid()
+        updates = {'expected_vm_state': 'meow',
+                   'moo': 'cow'}
+
+        class FakeInstance(dict):
+            def save(self, session=None):
+                pass
+
+        fake_instance_values = {'vm_state': 'meow',
+                                'hostname': '',
+                                'metadata': None,
+                                'system_metadata': None}
+        fake_instance = FakeInstance(fake_instance_values)
+
+        self.mox.StubOutWithMock(sqlalchemy_api, '_instance_get_by_uuid')
+        self.mox.StubOutWithMock(fake_instance, 'save')
+
+        sqlalchemy_api._instance_get_by_uuid(ctxt, uuid,
+                session=mox.IgnoreArg()).AndReturn(fake_instance)
+        fake_instance.save(session=mox.IgnoreArg())
+
+        self.mox.ReplayAll()
+
+        result = db.instance_update(ctxt, uuid, updates)
+        expected_instance = dict(fake_instance_values)
+        expected_instance['moo'] = 'cow'
+        self.assertEqual(expected_instance, result)
+
+    def test_instance_update_with_unexpected_vm_state(self):
+        ctxt = context.get_admin_context()
+        uuid = uuidutils.generate_uuid()
+        updates = {'expected_vm_state': 'meow'}
+        fake_instance = {'vm_state': 'nomatch'}
+
+        self.mox.StubOutWithMock(sqlalchemy_api, '_instance_get_by_uuid')
+
+        sqlalchemy_api._instance_get_by_uuid(ctxt, uuid,
+                session=mox.IgnoreArg()).AndReturn(fake_instance)
+
+        self.mox.ReplayAll()
+
+        self.assertRaises(exception.UnexpectedVMStateError,
+                          db.instance_update, ctxt, uuid, updates)
+
+    def test_instance_update_with_instance_uuid(self):
+        # test instance_update() works when an instance UUID is passed.
+        ctxt = context.get_admin_context()
+
+        # Create an instance with some metadata
+        values = {'metadata': {'host': 'foo', 'key1': 'meow'},
+                  'system_metadata': {'original_image_ref': 'blah'}}
+        instance = db.instance_create(ctxt, values)
+
+        # Update the metadata
+        values = {'metadata': {'host': 'bar', 'key2': 'wuff'},
+                  'system_metadata': {'original_image_ref': 'baz'}}
+        db.instance_update(ctxt, instance['uuid'], values)
+
+        # Retrieve the user-provided metadata to ensure it was successfully
+        # updated
+        instance_meta = db.instance_metadata_get(ctxt, instance['uuid'])
+        self.assertEqual('bar', instance_meta['host'])
+        self.assertEqual('wuff', instance_meta['key2'])
+        self.assertNotIn('key1', instance_meta)
+
+        # Retrieve the system metadata to ensure it was successfully updated
+        system_meta = db.instance_system_metadata_get(ctxt, instance['uuid'])
+        self.assertEqual('baz', system_meta['original_image_ref'])
+
+    def test_delete_instance_metadata_on_instance_destroy(self):
+        ctxt = context.get_admin_context()
+
+        # Create an instance with some metadata
+        values = {'metadata': {'host': 'foo', 'key1': 'meow'},
+                  'system_metadata': {'original_image_ref': 'blah'}}
+        instance = db.instance_create(ctxt, values)
+        instance_meta = db.instance_metadata_get(ctxt, instance['uuid'])
+        self.assertEqual('foo', instance_meta['host'])
+        self.assertEqual('meow', instance_meta['key1'])
+        db.instance_destroy(ctxt, instance['uuid'])
+        instance_meta = db.instance_metadata_get(ctxt, instance['uuid'])
+        # Make sure instance metadata is deleted as well
+        self.assertEqual({}, instance_meta)
+
+    def test_instance_update_unique_name(self):
+        otherprojectcontext = context.RequestContext(self.user_id,
+                                          "%s2" % self.project_id)
+
+        inst = self.create_instance_with_args(hostname='fake_name')
+        uuid1p1 = inst['uuid']
+        inst = self.create_instance_with_args(hostname='fake_name2')
+        uuid2p1 = inst['uuid']
+
+        inst = self.create_instance_with_args(context=otherprojectcontext,
+                                               hostname='fake_name3')
+        uuid1p2 = inst['uuid']
+
+        # osapi_compute_unique_server_name_scope is unset so this should work:
+        values = {'hostname': 'fake_name2'}
+        db.instance_update(self.context, uuid1p1, values)
+        values = {'hostname': 'fake_name'}
+        db.instance_update(self.context, uuid1p1, values)
+
+        # With scope 'global' any duplicate should fail.
+        self.flags(osapi_compute_unique_server_name_scope='global')
+        self.assertRaises(exception.InstanceExists,
+                          db.instance_update,
+                          self.context,
+                          uuid2p1,
+                          values)
+
+        self.assertRaises(exception.InstanceExists,
+                          db.instance_update,
+                          otherprojectcontext,
+                          uuid1p2,
+                          values)
+
+        # But we should definitely be able to update our name if we aren't
+        #  really changing it.
+        case_only_values = {'hostname': 'fake_NAME'}
+        db.instance_update(self.context, uuid1p1, case_only_values)
+
+        # With scope 'project' a duplicate in the project should fail:
+        self.flags(osapi_compute_unique_server_name_scope='project')
+        self.assertRaises(exception.InstanceExists,
+                          db.instance_update,
+                          self.context,
+                          uuid2p1,
+                          values)
+
+        # With scope 'project' a duplicate in a different project should work:
+        self.flags(osapi_compute_unique_server_name_scope='project')
+        db.instance_update(otherprojectcontext, uuid1p2, values)
+
+    def test_instance_update_with_and_get_original(self):
+        ctxt = context.get_admin_context()
+
+        # Create an instance with some metadata
+        values = {'vm_state': 'building'}
+        instance = db.instance_create(ctxt, values)
+
+        (old_ref, new_ref) = db.instance_update_and_get_original(ctxt,
+                instance['uuid'], {'vm_state': 'needscoffee'})
+        self.assertEquals("building", old_ref["vm_state"])
+        self.assertEquals("needscoffee", new_ref["vm_state"])
+
+    def _test_instance_update_updates_metadata(self, metadata_type):
+        ctxt = context.get_admin_context()
+
+        instance = db.instance_create(ctxt, {})
+
+        def set_and_check(meta):
+            inst = db.instance_update(ctxt, instance['uuid'],
+                               {metadata_type: dict(meta)})
+            _meta = utils.metadata_to_dict(inst[metadata_type])
+            self.assertEqual(meta, _meta)
+
+        meta = {'speed': '88', 'units': 'MPH'}
+        set_and_check(meta)
+
+        meta['gigawatts'] = '1.21'
+        set_and_check(meta)
+
+        del meta['gigawatts']
+        set_and_check(meta)
+
+    def test_instance_update_updates_system_metadata(self):
+        # Ensure that system_metadata is updated during instance_update
+        self._test_instance_update_updates_metadata('system_metadata')
+
+    def test_instance_update_updates_metadata(self):
+        # Ensure that metadata is updated during instance_update
+        self._test_instance_update_updates_metadata('metadata')
+
+    def test_instance_floating_address_get_all(self):
+        ctxt = context.get_admin_context()
+
+        instance1 = db.instance_create(ctxt, {'host': 'h1', 'hostname': 'n1'})
+        instance2 = db.instance_create(ctxt, {'host': 'h2', 'hostname': 'n2'})
+
+        fixed_addresses = ['1.1.1.1', '1.1.1.2', '1.1.1.3']
+        float_addresses = ['2.1.1.1', '2.1.1.2', '2.1.1.3']
+        instance_uuids = [instance1['uuid'], instance1['uuid'],
+                          instance2['uuid']]
+
+        for fixed_addr, float_addr, instance_uuid in zip(fixed_addresses,
+                                                         float_addresses,
+                                                         instance_uuids):
+            db.fixed_ip_create(ctxt, {'address': fixed_addr,
+                                      'instance_uuid': instance_uuid})
+            fixed_id = db.fixed_ip_get_by_address(ctxt, fixed_addr)['id']
+            db.floating_ip_create(ctxt,
+                                  {'address': float_addr,
+                                   'fixed_ip_id': fixed_id})
+
+        real_float_addresses = \
+                db.instance_floating_address_get_all(ctxt, instance_uuids[0])
+        self.assertEqual(set(float_addresses[:2]), set(real_float_addresses))
+        real_float_addresses = \
+                db.instance_floating_address_get_all(ctxt, instance_uuids[2])
+        self.assertEqual(set([float_addresses[2]]), set(real_float_addresses))
+
+
 class InstanceMetadataTestCase(test.TestCase):
 
     """Tests for db.api.instance_metadata_* methods."""
@@ -4949,6 +4958,19 @@ class ComputeNodeTestCase(test.TestCase, ModelsObjectComparatorMixin):
         self.assertNotEqual(self.item['updated_at'],
                                  item_updated['updated_at'])
 
+    def test_compute_node_update_override_updated_at(self):
+        # Update the record once so updated_at is set.
+        first = db.compute_node_update(self.ctxt, self.item['id'],
+                                       {'free_ram_mb': '12'})
+        self.assertIsNotNone(first['updated_at'])
+
+        # Update a second time. Make sure that the updated_at value we send
+        # is overridden.
+        second = db.compute_node_update(self.ctxt, self.item['id'],
+                                        {'updated_at': first.updated_at,
+                                         'free_ram_mb': '13'})
+        self.assertNotEqual(first['updated_at'], second['updated_at'])
+
     def test_compute_node_stat_unchanged(self):
         # don't update unchanged stat values:
         stats = self.item['stats']
diff --git a/nova/tests/db/test_migration_utils.py b/nova/tests/db/test_migration_utils.py
index 3674a7c45..af206632d 100644
--- a/nova/tests/db/test_migration_utils.py
+++ b/nova/tests/db/test_migration_utils.py
@@ -19,7 +19,7 @@ import warnings
 from migrate.changeset import UniqueConstraint
 from sqlalchemy.dialects import mysql
 from sqlalchemy import Boolean, Index, Integer, DateTime, String
-from sqlalchemy import MetaData, Table, Column
+from sqlalchemy import MetaData, Table, Column, ForeignKey
 from sqlalchemy.engine import reflection
 from sqlalchemy.exc import NoSuchTableError
 from sqlalchemy.exc import SAWarning
@@ -514,3 +514,28 @@ class TestMigrationUtils(test_migrations.BaseMigrationTestCase):
         #                 but sqlalchemy will set it to NullType.
         self.assertTrue(isinstance(table.c.foo.type, NullType))
         self.assertTrue(isinstance(table.c.deleted.type, Boolean))
+
+    def test_drop_unique_constraint_in_sqlite_fk_recreate(self):
+        engine = self.engines['sqlite']
+        meta = MetaData()
+        meta.bind = engine
+        parent_table = Table('table0', meta,
+                       Column('id', Integer, primary_key=True),
+                       Column('foo', Integer))
+        parent_table.create()
+        table_name = 'table1'
+        table = Table(table_name, meta,
+                      Column('id', Integer, primary_key=True),
+                      Column('baz', Integer),
+                      Column('bar', Integer, ForeignKey("table0.id")),
+                      UniqueConstraint('baz', name='constr1'))
+        table.create()
+        utils.drop_unique_constraint(engine, table_name, 'constr1', 'baz')
+
+        insp = reflection.Inspector.from_engine(engine)
+        f_keys = insp.get_foreign_keys(table_name)
+        self.assertEqual(len(f_keys), 1)
+        f_key = f_keys[0]
+        self.assertEqual(f_key['referred_table'], 'table0')
+        self.assertEqual(f_key['referred_columns'], ['id'])
+        self.assertEqual(f_key['constrained_columns'], ['bar'])
diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py
index bbde1787a..cbd856f4b 100644
--- a/nova/tests/fake_policy.py
+++ b/nova/tests/fake_policy.py
@@ -111,6 +111,7 @@ policy_data = """
     "compute_extension:attach_interfaces": "",
     "compute_extension:baremetal_nodes": "",
     "compute_extension:cells": "",
+    "compute_extension:v3:os-cells": "",
     "compute_extension:certificates": "",
     "compute_extension:v3:os-certificates": "",
     "compute_extension:cloudpipe": "",
@@ -135,6 +136,7 @@ policy_data = """
     "compute_extension:flavor_access": "",
     "compute_extension:v3:os-flavor-access": "",
     "compute_extension:flavor_disabled": "",
+    "compute_extension:v3:os-flavor-disabled": "",
     "compute_extension:flavor_rxtx": "",
     "compute_extension:flavor_swap": "",
     "compute_extension:flavorextradata": "",
@@ -154,6 +156,7 @@ policy_data = """
     "compute_extension:hosts": "",
     "compute_extension:hypervisors": "",
     "compute_extension:image_size": "",
+    "compute_extension:v3:os-images": "",
     "compute_extension:instance_actions": "",
     "compute_extension:instance_actions:events": "is_admin:True",
     "compute_extension:instance_usage_audit_log": "",
@@ -176,6 +179,7 @@ policy_data = """
     "compute_extension:security_group_default_rules": "",
     "compute_extension:security_groups": "",
     "compute_extension:server_diagnostics": "",
+    "compute_extension:v3:os-server-diagnostics": "",
     "compute_extension:server_password": "",
     "compute_extension:server_usage": "",
     "compute_extension:services": "",
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index 48d4db1fd..8832f5c2b 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -536,6 +536,64 @@ class HostFiltersTestCase(test.NoDBTestCase):
         self.assertTrue(filt_cls.host_passes(host, filter_properties))
         self.assertEqual(2048 * 2.0, host.limits['memory_mb'])
 
+    def test_aggregate_ram_filter_value_error(self):
+        self._stub_service_is_up(True)
+        filt_cls = self.class_map['AggregateRamFilter']()
+        self.flags(ram_allocation_ratio=1.0)
+        filter_properties = {'context': self.context,
+                             'instance_type': {'memory_mb': 1024}}
+        capabilities = {'enabled': True}
+        service = {'disabled': False}
+        host = fakes.FakeHostState('host1', 'node1',
+                {'free_ram_mb': 1024, 'total_usable_ram_mb': 1024,
+                 'capabilities': capabilities, 'service': service})
+        self._create_aggregate_with_host(name='fake_aggregate',
+                hosts=['host1'],
+                metadata={'ram_allocation_ratio': 'XXX'})
+        self.assertTrue(filt_cls.host_passes(host, filter_properties))
+        self.assertEqual(1024 * 1.0, host.limits['memory_mb'])
+
+    def test_aggregate_ram_filter_default_value(self):
+        self._stub_service_is_up(True)
+        filt_cls = self.class_map['AggregateRamFilter']()
+        self.flags(ram_allocation_ratio=1.0)
+        filter_properties = {'context': self.context,
+                             'instance_type': {'memory_mb': 1024}}
+        capabilities = {'enabled': True}
+        service = {'disabled': False}
+        host = fakes.FakeHostState('host1', 'node1',
+                {'free_ram_mb': 1023, 'total_usable_ram_mb': 1024,
+                 'capabilities': capabilities, 'service': service})
+        # False: fallback to default flag w/o aggregates
+        self.assertFalse(filt_cls.host_passes(host, filter_properties))
+        self._create_aggregate_with_host(name='fake_aggregate',
+                hosts=['host1'],
+                metadata={'ram_allocation_ratio': '2.0'})
+        # True: use ratio from aggregates
+        self.assertTrue(filt_cls.host_passes(host, filter_properties))
+        self.assertEqual(1024 * 2.0, host.limits['memory_mb'])
+
+    def test_aggregate_ram_filter_conflict_values(self):
+        self._stub_service_is_up(True)
+        filt_cls = self.class_map['AggregateRamFilter']()
+        self.flags(ram_allocation_ratio=1.0)
+        filter_properties = {'context': self.context,
+                             'instance_type': {'memory_mb': 1024}}
+        capabilities = {'enabled': True}
+        service = {'disabled': False}
+        host = fakes.FakeHostState('host1', 'node1',
+                {'free_ram_mb': 1023, 'total_usable_ram_mb': 1024,
+                 'capabilities': capabilities, 'service': service})
+        self._create_aggregate_with_host(name='fake_aggregate1',
+                hosts=['host1'],
+                metadata={'ram_allocation_ratio': '1.5'})
+        self._create_aggregate_with_host(name='fake_aggregate2',
+                hosts=['host1'],
+                metadata={'ram_allocation_ratio': '2.0'})
+        # use the minimum ratio from aggregates
+        self.assertTrue(filt_cls.host_passes(host, filter_properties))
+        self.assertEqual(1024 * 1.5, host.limits['memory_mb'])
+
     def test_disk_filter_passes(self):
         self._stub_service_is_up(True)
         filt_cls = self.class_map['DiskFilter']()
@@ -1310,6 +1368,52 @@ class HostFiltersTestCase(test.NoDBTestCase):
                 {'vcpus_total': 4, 'vcpus_used': 8})
         self.assertFalse(filt_cls.host_passes(host, filter_properties))
 
+    def test_aggregate_core_filter_value_error(self):
+        filt_cls = self.class_map['AggregateCoreFilter']()
+        filter_properties = {'context': self.context,
+                             'instance_type': {'vcpus': 1}}
+        self.flags(cpu_allocation_ratio=2)
+        host = fakes.FakeHostState('host1', 'node1',
+                {'vcpus_total': 4, 'vcpus_used': 7})
+        self._create_aggregate_with_host(name='fake_aggregate',
+                hosts=['host1'],
+                metadata={'cpu_allocation_ratio': 'XXX'})
+        self.assertTrue(filt_cls.host_passes(host, filter_properties))
+        self.assertEqual(4 * 2, host.limits['vcpu'])
+
+    def test_aggregate_core_filter_default_value(self):
+        filt_cls = self.class_map['AggregateCoreFilter']()
+        filter_properties = {'context': self.context,
+                             'instance_type': {'vcpus': 1}}
+        self.flags(cpu_allocation_ratio=2)
+        host = fakes.FakeHostState('host1', 'node1',
+                {'vcpus_total': 4, 'vcpus_used': 8})
+        # False: fallback to default flag w/o aggregates
+        self.assertFalse(filt_cls.host_passes(host, filter_properties))
+        self._create_aggregate_with_host(name='fake_aggregate',
+                hosts=['host1'],
+                metadata={'cpu_allocation_ratio': '3'})
+        # True: use ratio from aggregates
+        self.assertTrue(filt_cls.host_passes(host, filter_properties))
+        self.assertEqual(4 * 3, host.limits['vcpu'])
+
+    def test_aggregate_core_filter_conflict_values(self):
+        filt_cls = self.class_map['AggregateCoreFilter']()
+        filter_properties = {'context': self.context,
+                             'instance_type': {'vcpus': 1}}
+        self.flags(cpu_allocation_ratio=1)
+        host = fakes.FakeHostState('host1', 'node1',
+                {'vcpus_total': 4, 'vcpus_used': 8})
+        self._create_aggregate_with_host(name='fake_aggregate1',
+                hosts=['host1'],
+                metadata={'cpu_allocation_ratio': '2'})
+        self._create_aggregate_with_host(name='fake_aggregate2',
+                hosts=['host1'],
+                metadata={'cpu_allocation_ratio': '3'})
+        # use the minimum ratio from aggregates
+        self.assertFalse(filt_cls.host_passes(host, filter_properties))
+        self.assertEqual(4 * 2, host.limits['vcpu'])
+
     @staticmethod
     def _make_zone_request(zone, is_admin=False):
         ctxt = context.RequestContext('fake', 'fake', is_admin=is_admin)
diff --git a/nova/tests/virt/powervm/test_powervm.py b/nova/tests/virt/powervm/test_powervm.py
index 6628c23ea..fddd97a9d 100644
--- a/nova/tests/virt/powervm/test_powervm.py
+++ b/nova/tests/virt/powervm/test_powervm.py
@@ -173,7 +173,8 @@ class FakeBlockAdapter(powervm_blockdev.PowerVMLocalVolumeAdapter):
 
 
 def fake_get_powervm_operator():
-    return FakeIVMOperator(None)
+    return FakeIVMOperator(common.Connection('fake_host', 'fake_user',
+                                             'fake_password'))
 
 
 def create_instance(testcase):
@@ -618,6 +619,25 @@ class PowerVMDriverTestCase(test.TestCase):
         self.assertEquals(host_stats['supported_instances'][0][1], "powervm")
         self.assertEquals(host_stats['supported_instances'][0][2], "hvm")
 
+    def test_get_host_uptime(self):
+        """
+        Tests that the get_host_uptime method issues the proper sysstat command
+        and parses the output correctly.
+        """
+        exp_cmd = "ioscli sysstat -short fake_user"
+        output = [("02:54PM  up 24 days,  5:41, 1 user, "
+                   "load average: 0.06, 0.03, 0.02")]
+
+        fake_op = self.powervm_connection._powervm
+        self.mox.StubOutWithMock(fake_op._operator, 'run_vios_command')
+        fake_op._operator.run_vios_command(exp_cmd).AndReturn(output)
+
+        self.mox.ReplayAll()
+
+        # the host parameter isn't used so we just pass None
+        uptime = self.powervm_connection.get_host_uptime(None)
+        self.assertEquals("02:54PM  up 24 days  5:41", uptime)
+
 
 class PowerVMDriverLparTestCase(test.TestCase):
     """Unit tests for PowerVM connection calls."""
diff --git a/nova/tests/virt/vmwareapi/test_vmwareapi.py b/nova/tests/virt/vmwareapi/test_vmwareapi.py
index 62db10535..afda26b0d 100644
--- a/nova/tests/virt/vmwareapi/test_vmwareapi.py
+++ b/nova/tests/virt/vmwareapi/test_vmwareapi.py
@@ -531,7 +531,7 @@ class VMwareAPIVMTestCase(test.TestCase):
         self._create_instance_in_the_db()
         self._create_vm()
         vnc_dict = self.conn.get_vnc_console(self.instance)
-        self.assertEquals(vnc_dict['host'], "test_url")
+        self.assertEquals(vnc_dict['host'], "ha-host")
         self.assertEquals(vnc_dict['port'], 5910)
 
     def test_host_ip_addr(self):
diff --git a/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py b/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
index 123a314c1..0456dfece 100644
--- a/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
+++ b/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
@@ -16,6 +16,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from collections import namedtuple
+
 from nova import exception
 from nova import test
 from nova.virt.vmwareapi import fake
@@ -33,9 +35,11 @@ class fake_session(object):
 class VMwareVMUtilTestCase(test.TestCase):
     def setUp(self):
         super(VMwareVMUtilTestCase, self).setUp()
+        fake.reset()
 
     def tearDown(self):
         super(VMwareVMUtilTestCase, self).tearDown()
+        fake.reset()
 
     def test_get_datastore_ref_and_name(self):
         result = vm_util.get_datastore_ref_and_name(
@@ -54,3 +58,95 @@ class VMwareVMUtilTestCase(test.TestCase):
         self.assertRaises(exception.DatastoreNotFound,
                 vm_util.get_datastore_ref_and_name,
                 fake_session(), cluster="fake-cluster")
+
+    def test_get_host_ref_from_id(self):
+
+        fake_host_sys = fake.HostSystem(
+            fake.ManagedObjectReference("HostSystem", "host-123"))
+
+        fake_host_id = fake_host_sys.obj.value
+        fake_host_name = "ha-host"
+
+        ref = vm_util.get_host_ref_from_id(
+            fake_session([fake_host_sys]), fake_host_id, ['name'])
+
+        self.assertIsInstance(ref, fake.HostSystem)
+        self.assertEqual(fake_host_id, ref.obj.value)
+
+        host_name = vm_util.get_host_name_from_host_ref(ref)
+
+        self.assertEquals(fake_host_name, host_name)
+
+    def test_get_host_name_for_vm(self):
+
+        fake_vm = fake.ManagedObject(
+            "VirtualMachine", fake.ManagedObjectReference(
+                "vm-123", "VirtualMachine"))
+        fake_vm.propSet.append(
+            fake.Property('name', 'vm-123'))
+
+        vm_ref = vm_util.get_vm_ref_from_name(
+                fake_session([fake_vm]), 'vm-123')
+
+        self.assertIsNotNone(vm_ref)
+
+        fake_results = [
+            fake.ObjectContent(
+                None, [
+                    fake.Property('runtime.host',
+                              fake.ManagedObjectReference(
+                                'host-123', 'HostSystem'))
+                ])]
+
+        host_id = vm_util.get_host_id_from_vm_ref(
+            fake_session(fake_results), vm_ref)
+
+        self.assertEqual('host-123', host_id)
+
+    def test_property_from_property_set(self):
+
+        ObjectContent = namedtuple('ObjectContent', ['propSet'])
+        DynamicProperty = namedtuple('Property', ['name', 'val'])
+        MoRef = namedtuple('Val', ['value'])
+
+        results_good = [
+            ObjectContent(propSet=[
+                DynamicProperty(name='name', val=MoRef(value='vm-123'))]),
+            ObjectContent(propSet=[
+                DynamicProperty(name='foo', val=MoRef(value='bar1')),
+                DynamicProperty(
+                    name='runtime.host', val=MoRef(value='host-123')),
+                DynamicProperty(name='foo', val=MoRef(value='bar2')),
+            ]),
+            ObjectContent(propSet=[
+                DynamicProperty(
+                    name='something', val=MoRef(value='thing'))]), ]
+
+        results_bad = [
+            ObjectContent(propSet=[
+                DynamicProperty(name='name', val=MoRef(value='vm-123'))]),
+            ObjectContent(propSet=[
+                DynamicProperty(name='foo', val='bar1'),
+                DynamicProperty(name='foo', val='bar2'), ]),
+            ObjectContent(propSet=[
+                DynamicProperty(
+                    name='something', val=MoRef(value='thing'))]), ]
+
+        prop = vm_util.property_from_property_set(
+                    'runtime.host', results_good)
+        self.assertIsNotNone(prop)
+        value = prop.val.value
+        self.assertEqual('host-123', value)
+
+        prop2 = vm_util.property_from_property_set(
+                    'runtime.host', results_bad)
+        self.assertIsNone(prop2)
+
+        prop3 = vm_util.property_from_property_set('foo', results_good)
+        self.assertIsNotNone(prop3)
+        val3 = prop3.val.value
+        self.assertEqual('bar1', val3)
+
+        prop4 = vm_util.property_from_property_set('foo', results_bad)
+        self.assertIsNotNone(prop4)
+        self.assertEqual('bar1', prop4.val)
diff --git a/nova/virt/hyperv/imagecache.py b/nova/virt/hyperv/imagecache.py
index 8f29a62dc..6186b81c2 100644
--- a/nova/virt/hyperv/imagecache.py
+++ b/nova/virt/hyperv/imagecache.py
@@ -66,11 +66,12 @@ class ImageCache(object):
         root_vhd_size = root_vhd_size_gb * 1024 ** 3
 
         if root_vhd_size < vhd_size:
-            raise vmutils.HyperVException(_("Cannot resize the image to a "
-                                            "size smaller than the VHD max. "
-                                            "internal size: %(vhd_size)s. "
-                                            "Requested disk size: "
-                                            "%(root_vhd_size)s") % locals())
+            raise vmutils.HyperVException(
+                _("Cannot resize the image to a size smaller than the VHD "
+                  "max. internal size: %(vhd_size)s. Requested disk size: "
+                  "%(root_vhd_size)s") %
+                {'vhd_size': vhd_size, 'root_vhd_size': root_vhd_size}
+            )
         if root_vhd_size > vhd_size:
             path_parts = os.path.splitext(vhd_path)
             resized_vhd_path = '%s_%s%s' % (path_parts[0],
@@ -82,10 +83,14 @@ class ImageCache(object):
                 if not self._pathutils.exists(resized_vhd_path):
                     try:
                         LOG.debug(_("Copying VHD %(vhd_path)s to "
-                                    "%(resized_vhd_path)s") % locals())
+                                    "%(resized_vhd_path)s"),
+                                  {'vhd_path': vhd_path,
+                                   'resized_vhd_path': resized_vhd_path})
                         self._pathutils.copyfile(vhd_path, resized_vhd_path)
                         LOG.debug(_("Resizing VHD %(resized_vhd_path)s to new "
-                                    "size %(root_vhd_size)s") % locals())
+                                    "size %(root_vhd_size)s"),
+                                  {'resized_vhd_path': resized_vhd_path,
+                                   'root_vhd_size': root_vhd_size})
                         self._vhdutils.resize_vhd(resized_vhd_path,
                                                   root_vhd_size)
                     except Exception:
diff --git a/nova/virt/hyperv/livemigrationutils.py b/nova/virt/hyperv/livemigrationutils.py
index 2563e1182..9fce5343a 100644
--- a/nova/virt/hyperv/livemigrationutils.py
+++ b/nova/virt/hyperv/livemigrationutils.py
@@ -155,8 +155,10 @@ class LiveMigrationUtils(object):
 
                 LOG.debug(_("Replacing host resource "
                             "%(old_disk_path)s with "
-                            "%(new_disk_path)s on planned VM %(vm_name)s") %
-                          locals())
+                            "%(new_disk_path)s on planned VM %(vm_name)s"),
+                          {'old_disk_path': old_disk_path,
+                           'new_disk_path': new_disk_path,
+                           'vm_name': vm_name})
                 sasd.HostResource = [new_disk_path]
                 updated_resource_setting_data.append(sasd.GetText_(1))
 
diff --git a/nova/virt/hyperv/migrationops.py b/nova/virt/hyperv/migrationops.py
index 5ce092bf3..19afdd717 100644
--- a/nova/virt/hyperv/migrationops.py
+++ b/nova/virt/hyperv/migrationops.py
@@ -71,7 +71,8 @@ class MigrationOps(object):
                 # Skip the config drive as the instance is already configured
                 if os.path.basename(disk_file).lower() != 'configdrive.vhd':
                     LOG.debug(_('Copying disk "%(disk_file)s" to '
-                                '"%(dest_path)s"') % locals())
+                                '"%(dest_path)s"'),
+                              {'disk_file': disk_file, 'dest_path': dest_path})
                     self._pathutils.copy(disk_file, dest_path)
 
             self._pathutils.rename(instance_path, revert_path)
@@ -100,12 +101,11 @@ class MigrationOps(object):
         curr_root_gb = instance['root_gb']
 
         if new_root_gb < curr_root_gb:
-            raise vmutils.VHDResizeException(_("Cannot resize the root disk "
-                                               "to a smaller size. Current "
-                                               "size: %(curr_root_gb)s GB. "
-                                               "Requested size: "
-                                               "%(new_root_gb)s GB") %
-                                             locals())
+            raise vmutils.VHDResizeException(
+                _("Cannot resize the root disk to a smaller size. Current "
+                  "size: %(curr_root_gb)s GB. Requested size: "
+                  "%(new_root_gb)s GB") %
+                {'curr_root_gb': curr_root_gb, 'new_root_gb': new_root_gb})
 
     def migrate_disk_and_power_off(self, context, instance, dest,
                                    instance_type, network_info,
@@ -165,17 +165,23 @@ class MigrationOps(object):
                                           os.path.basename(base_vhd_path))
         try:
             LOG.debug(_('Copying base disk %(base_vhd_path)s to '
-                        '%(base_vhd_copy_path)s'), locals())
+                        '%(base_vhd_copy_path)s'),
+                      {'base_vhd_path': base_vhd_path,
+                       'base_vhd_copy_path': base_vhd_copy_path})
             self._pathutils.copyfile(base_vhd_path, base_vhd_copy_path)
 
             LOG.debug(_("Reconnecting copied base VHD "
                         "%(base_vhd_copy_path)s and diff "
-                        "VHD %(diff_vhd_path)s"), locals())
+                        "VHD %(diff_vhd_path)s"),
+                      {'base_vhd_copy_path': base_vhd_copy_path,
+                       'diff_vhd_path': diff_vhd_path})
             self._vhdutils.reconnect_parent_vhd(diff_vhd_path,
                                                 base_vhd_copy_path)
 
             LOG.debug(_("Merging base disk %(base_vhd_copy_path)s and "
-                        "diff disk %(diff_vhd_path)s"), locals())
+                        "diff disk %(diff_vhd_path)s"),
+                      {'base_vhd_copy_path': base_vhd_copy_path,
+                       'diff_vhd_path': diff_vhd_path})
             self._vhdutils.merge_vhd(diff_vhd_path, base_vhd_copy_path)
 
             # Replace the differential VHD with the merged one
@@ -192,7 +198,8 @@ class MigrationOps(object):
             # A differential VHD cannot be resized
             self._merge_base_vhd(vhd_path, base_disk_path)
         LOG.debug(_("Resizing disk \"%(vhd_path)s\" to new max "
-                    "size %(new_size)s"), locals())
+                    "size %(new_size)s"),
+                  {'vhd_path': vhd_path, 'new_size': new_size})
         self._vhdutils.resize_vhd(vhd_path, new_size)
 
     def _check_base_disk(self, context, instance, diff_vhd_path,
@@ -204,7 +211,9 @@ class MigrationOps(object):
         if src_base_disk_path.lower() != base_vhd_path.lower():
             LOG.debug(_("Reconnecting copied base VHD "
                         "%(base_vhd_path)s and diff "
-                        "VHD %(diff_vhd_path)s"), locals())
+                        "VHD %(diff_vhd_path)s"),
+                      {'base_vhd_path': base_vhd_path,
+                       'diff_vhd_path': diff_vhd_path})
             self._vhdutils.reconnect_parent_vhd(diff_vhd_path,
                                                 base_vhd_path)
 
diff --git a/nova/virt/hyperv/networkutils.py b/nova/virt/hyperv/networkutils.py
index 4e1f68685..626240ca3 100644
--- a/nova/virt/hyperv/networkutils.py
+++ b/nova/virt/hyperv/networkutils.py
@@ -58,5 +58,7 @@ class NetworkUtils(object):
         if ret_val != 0:
             raise vmutils.HyperVException(_("Failed to create vswitch port "
                                             "%(port_name)s on switch "
-                                            "%(vswitch_path)s") % locals())
+                                            "%(vswitch_path)s") %
+                                          {'port_name': port_name,
+                                           'vswitch_path': vswitch_path})
         return new_port
diff --git a/nova/virt/hyperv/pathutils.py b/nova/virt/hyperv/pathutils.py
index 6e54bf4c8..21bb82f72 100644
--- a/nova/virt/hyperv/pathutils.py
+++ b/nova/virt/hyperv/pathutils.py
@@ -69,7 +69,7 @@ class PathUtils(object):
         # spawning overhead.
         if subprocess.call(['cmd.exe', '/C', 'copy', '/Y', src, dest]):
             raise IOError(_('The file copy from %(src)s to %(dest)s failed')
-                           % locals())
+                           % {'src': src, 'dest': dest})
 
     def rmtree(self, path):
         shutil.rmtree(path)
@@ -83,7 +83,8 @@ class PathUtils(object):
             else:
                 # Use an administrative share
                 path = local_instance_path.replace(':', '$')
-            return '\\\\%(remote_server)s\\%(path)s' % locals()
+            return ('\\\\%(remote_server)s\\%(path)s' %
+                {'remote_server': remote_server, 'path': path})
         else:
             return local_instance_path
 
diff --git a/nova/virt/hyperv/snapshotops.py b/nova/virt/hyperv/snapshotops.py
index 5bed46665..c75b54e9e 100644
--- a/nova/virt/hyperv/snapshotops.py
+++ b/nova/virt/hyperv/snapshotops.py
@@ -71,7 +71,8 @@ class SnapshotOps(object):
             dest_vhd_path = os.path.join(export_dir, os.path.basename(
                 src_vhd_path))
             LOG.debug(_('Copying VHD %(src_vhd_path)s to %(dest_vhd_path)s'),
-                      locals())
+                      {'src_vhd_path': src_vhd_path,
+                       'dest_vhd_path': dest_vhd_path})
             self._pathutils.copyfile(src_vhd_path, dest_vhd_path)
 
             image_vhd_path = None
@@ -81,29 +82,37 @@ class SnapshotOps(object):
                 basename = os.path.basename(src_base_disk_path)
                 dest_base_disk_path = os.path.join(export_dir, basename)
                 LOG.debug(_('Copying base disk %(src_vhd_path)s to '
-                            '%(dest_base_disk_path)s'), locals())
+                            '%(dest_base_disk_path)s'),
+                          {'src_vhd_path': src_vhd_path,
+                           'dest_base_disk_path': dest_base_disk_path})
                 self._pathutils.copyfile(src_base_disk_path,
                                          dest_base_disk_path)
 
                 LOG.debug(_("Reconnecting copied base VHD "
                             "%(dest_base_disk_path)s and diff "
-                            "VHD %(dest_vhd_path)s"), locals())
+                            "VHD %(dest_vhd_path)s"),
+                          {'dest_base_disk_path': dest_base_disk_path,
+                           'dest_vhd_path': dest_vhd_path})
                 self._vhdutils.reconnect_parent_vhd(dest_vhd_path,
                                                     dest_base_disk_path)
 
                 LOG.debug(_("Merging base disk %(dest_base_disk_path)s and "
-                            "diff disk %(dest_vhd_path)s"), locals())
+                            "diff disk %(dest_vhd_path)s"),
+                          {'dest_base_disk_path': dest_base_disk_path,
+                           'dest_vhd_path': dest_vhd_path})
                 self._vhdutils.merge_vhd(dest_vhd_path, dest_base_disk_path)
                 image_vhd_path = dest_base_disk_path
 
-            LOG.debug(_("Updating Glance image %(image_id)s with content from "
-                        "merged disk %(image_vhd_path)s"), locals())
+            LOG.debug(_("Updating Glance image %(name)s with content from "
+                        "merged disk %(image_vhd_path)s"),
+                      {'image_id': name, 'image_vhd_path': image_vhd_path})
             update_task_state(task_state=task_states.IMAGE_UPLOADING,
                               expected_state=task_states.IMAGE_PENDING_UPLOAD)
             self._save_glance_image(context, name, image_vhd_path)
 
-            LOG.debug(_("Snapshot image %(image_id)s updated for VM "
-                        "%(instance_name)s"), locals())
+            LOG.debug(_("Snapshot image %(name)s updated for VM "
+                        "%(instance_name)s"),
+                      {'name': name, 'instance_name': instance_name})
         finally:
             try:
                 LOG.debug(_("Removing snapshot %s"), name)
diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py
index 2bda94a35..dfae02aad 100644
--- a/nova/virt/hyperv/vmops.py
+++ b/nova/virt/hyperv/vmops.py
@@ -119,13 +119,16 @@ class VMOps(object):
         try:
             if CONF.use_cow_images:
                 LOG.debug(_("Creating differencing VHD. Parent: "
-                            "%(base_vhd_path)s, Target: %(root_vhd_path)s")
-                          % locals())
+                            "%(base_vhd_path)s, Target: %(root_vhd_path)s"),
+                          {'base_vhd_path': base_vhd_path,
+                           'root_vhd_path': root_vhd_path})
                 self._vhdutils.create_differencing_vhd(root_vhd_path,
                                                        base_vhd_path)
             else:
                 LOG.debug(_("Copying VHD image %(base_vhd_path)s to target: "
-                            "%(root_vhd_path)s") % locals())
+                            "%(root_vhd_path)s"),
+                          {'base_vhd_path': base_vhd_path,
+                           'root_vhd_path': root_vhd_path})
                 self._pathutils.copyfile(base_vhd_path, root_vhd_path)
 
                 base_vhd_info = self._vhdutils.get_vhd_info(base_vhd_path)
@@ -137,7 +140,9 @@ class VMOps(object):
                                                     "smaller size"))
                 elif root_vhd_size > base_vhd_size:
                     LOG.debug(_("Resizing VHD %(root_vhd_path)s to new "
-                                "size %(root_vhd_size)s") % locals())
+                                "size %(root_vhd_size)s"),
+                              {'base_vhd_path': base_vhd_path,
+                               'root_vhd_path': root_vhd_path})
                     self._vhdutils.resize_vhd(root_vhd_path, root_vhd_size)
         except Exception:
             with excutils.save_and_reraise_exception():
@@ -336,9 +341,11 @@ class VMOps(object):
         try:
             self._vmutils.set_vm_state(vm_name, req_state)
             LOG.debug(_("Successfully changed state of VM %(vm_name)s"
-                        " to: %(req_state)s") % locals())
+                        " to: %(req_state)s"),
+                      {'vm_name': vm_name, 'req_state': req_state})
         except Exception as ex:
             LOG.exception(ex)
-            msg = _("Failed to change vm state of %(vm_name)s"
-                    " to %(req_state)s") % locals()
+            msg = (_("Failed to change vm state of %(vm_name)s"
+                     " to %(req_state)s") %
+                   {'vm_name': vm_name, 'req_state': req_state})
             raise vmutils.HyperVException(msg)
diff --git a/nova/virt/hyperv/vmutils.py b/nova/virt/hyperv/vmutils.py
index 2cc40a1de..dd03eb88b 100644
--- a/nova/virt/hyperv/vmutils.py
+++ b/nova/virt/hyperv/vmutils.py
@@ -223,8 +223,8 @@ class VMUtils(object):
         drivedflt = self._conn.query("SELECT * FROM "
                                      "Msvm_ResourceAllocationSettingData "
                                      "WHERE ResourceSubType LIKE "
-                                     "'%(res_sub_type)s' AND InstanceID LIKE "
-                                     "'%%Default%%'" % locals())[0]
+                                     "'%s' AND InstanceID LIKE "
+                                     "'%%Default%%'" % res_sub_type)[0]
         drive = self._clone_wmi_obj('Msvm_ResourceAllocationSettingData',
                                     drivedflt)
         #Set the IDE ctrller as parent.
@@ -243,9 +243,9 @@ class VMUtils(object):
         drivedefault = self._conn.query("SELECT * FROM "
                                         "Msvm_ResourceAllocationSettingData "
                                         "WHERE ResourceSubType LIKE "
-                                        "'%(res_sub_type)s' AND "
+                                        "'%s' AND "
                                         "InstanceID LIKE '%%Default%%'"
-                                        % locals())[0]
+                                        % res_sub_type)[0]
 
         #Clone the default and point it to the image file.
         res = self._clone_wmi_obj('Msvm_ResourceAllocationSettingData',
@@ -329,8 +329,9 @@ class VMUtils(object):
         #Invalid state for current operation (32775) typically means that
         #the VM is already in the state requested
         self.check_ret_val(ret_val, job_path, [0, 32775])
-        LOG.debug(_("Successfully changed vm state of %(vm_name)s"
-                    " to %(req_state)s") % locals())
+        LOG.debug(_("Successfully changed vm state of %(vm_name)s "
+                    "to %(req_state)s"),
+                  {'vm_name': vm_name, 'req_state': req_state})
 
     def get_vm_storage_paths(self, vm_name):
         vm = self._lookup_vm_check(vm_name)
@@ -391,23 +392,28 @@ class VMUtils(object):
                 raise HyperVException(_("WMI job failed with status "
                                         "%(job_state)d. Error details: "
                                         "%(err_sum_desc)s - %(err_desc)s - "
-                                        "Error code: %(err_code)d")
-                                      % locals())
+                                        "Error code: %(err_code)d") %
+                                      {'job_state': job_state,
+                                       'err_sum_desc': err_sum_desc,
+                                       'err_desc': err_desc,
+                                       'err_code': err_code})
             else:
                 (error, ret_val) = job.GetError()
                 if not ret_val and error:
                     raise HyperVException(_("WMI job failed with status "
                                             "%(job_state)d. Error details: "
-                                            "%(error)s") % locals())
+                                            "%(error)s") %
+                                          {'job_state': job_state,
+                                           'error': error})
                 else:
                     raise HyperVException(_("WMI job failed with status "
-                                            "%(job_state)d. No error "
-                                            "description available")
-                                          % locals())
+                                            "%d. No error "
+                                            "description available") %
+                                          job_state)
         desc = job.Description
         elap = job.ElapsedTime
-        LOG.debug(_("WMI job succeeded: %(desc)s, Elapsed=%(elap)s")
-                  % locals())
+        LOG.debug(_("WMI job succeeded: %(desc)s, Elapsed=%(elap)s"),
+                  {'desc': desc, 'elap': elap})
 
     def _clone_wmi_obj(self, wmi_class, wmi_obj):
         """Clone a WMI object."""
diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py
index 1b6f10d16..b378070c9 100644
--- a/nova/virt/hyperv/volumeops.py
+++ b/nova/virt/hyperv/volumeops.py
@@ -97,11 +97,15 @@ class VolumeOps(object):
         if self._volutils.get_device_number_for_target(target_iqn, target_lun):
             LOG.debug(_("Already logged in on storage target. No need to "
                         "login. Portal: %(target_portal)s, "
-                        "IQN: %(target_iqn)s, LUN: %(target_lun)s") % locals())
+                        "IQN: %(target_iqn)s, LUN: %(target_lun)s"),
+                      {'target_portal': target_portal,
+                       'target_iqn': target_iqn, 'target_lun': target_lun})
         else:
             LOG.debug(_("Logging in on storage target. Portal: "
                         "%(target_portal)s, IQN: %(target_iqn)s, "
-                        "LUN: %(target_lun)s") % locals())
+                        "LUN: %(target_lun)s"),
+                      {'target_portal': target_portal,
+                       'target_iqn': target_iqn, 'target_lun': target_lun})
             self._volutils.login_storage_target(target_lun, target_iqn,
                                                 target_portal)
             # Wait for the target to be mounted
@@ -112,8 +116,9 @@ class VolumeOps(object):
         Attach a volume to the SCSI controller or to the IDE controller if
         ebs_root is True
         """
-        LOG.debug(_("Attach_volume: %(connection_info)s to %(instance_name)s")
-                  % locals())
+        LOG.debug(_("Attach_volume: %(connection_info)s to %(instance_name)s"),
+                  {'connection_info': connection_info,
+                   'instance_name': instance_name})
         try:
             self._login_storage_target(connection_info)
 
@@ -157,13 +162,15 @@ class VolumeOps(object):
             self.detach_volume(vol['connection_info'], instance_name)
 
     def logout_storage_target(self, target_iqn):
-        LOG.debug(_("Logging off storage target %(target_iqn)s") % locals())
+        LOG.debug(_("Logging off storage target %s"), target_iqn)
         self._volutils.logout_storage_target(target_iqn)
 
     def detach_volume(self, connection_info, instance_name):
         """Dettach a volume to the SCSI controller."""
         LOG.debug(_("Detach_volume: %(connection_info)s "
-                    "from %(instance_name)s") % locals())
+                    "from %(instance_name)s"),
+                  {'connection_info': connection_info,
+                   'instance_name': instance_name})
 
         data = connection_info['data']
         target_lun = data['target_lun']
@@ -198,7 +205,8 @@ class VolumeOps(object):
             raise exception.NotFound(_('Unable to find a mounted disk for '
                                        'target_iqn: %s') % target_iqn)
         LOG.debug(_('Device number: %(device_number)s, '
-                    'target lun: %(target_lun)s') % locals())
+                    'target lun: %(target_lun)s'),
+                  {'device_number': device_number, 'target_lun': target_lun})
         #Finding Mounted disk drive
         for i in range(0, CONF.hyperv.volume_attach_retry_count):
             mounted_disk_path = self._vmutils.get_mounted_disk_by_drive_number(
diff --git a/nova/virt/powervm/command.py b/nova/virt/powervm/command.py
index eec7fc2d3..aa82650cc 100644
--- a/nova/virt/powervm/command.py
+++ b/nova/virt/powervm/command.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2012 IBM Corp.
+# Copyright 2013 IBM Corp.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -68,6 +68,15 @@ class BaseCommand(object):
     def chsyscfg(self, args=''):
         return 'chsyscfg %s' % args
 
+    def sysstat(self, args=''):
+        """
+        Returns a string of the formatted sysstat command to run.
+        Typically this command should be run with the -short option
+        and a User operand should be provided to narrow the results.
+        :returns: string - formatted sysstat command
+        """
+        return 'sysstat %s' % args
+
 
 class IVMCommand(BaseCommand):
 
@@ -97,3 +106,6 @@ class IVMCommand(BaseCommand):
 
     def hostname(self, args=''):
         return 'ioscli ' + BaseCommand.hostname(self, args=args)
+
+    def sysstat(self, args=''):
+        return 'ioscli ' + BaseCommand.sysstat(self, args=args)
diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py
index e49bbb209..a97f7d011 100755
--- a/nova/virt/powervm/driver.py
+++ b/nova/virt/powervm/driver.py
@@ -90,6 +90,10 @@ class PowerVMDriver(driver.ComputeDriver):
         """Return currently known host stats."""
         return self._powervm.get_host_stats(refresh=refresh)
 
+    def get_host_uptime(self, host):
+        """Returns the result of calling "uptime" on the target host."""
+        return self._powervm.get_host_uptime(host)
+
     def plug_vifs(self, instance, network_info):
         pass
 
diff --git a/nova/virt/powervm/operator.py b/nova/virt/powervm/operator.py
index fffb77fc9..9d59e7ce4 100644
--- a/nova/virt/powervm/operator.py
+++ b/nova/virt/powervm/operator.py
@@ -169,6 +169,10 @@ class PowerVMOperator(object):
 
         self._host_stats = data
 
+    def get_host_uptime(self, host):
+        """Returns the result of calling "uptime" on the target host."""
+        return self._operator.get_host_uptime(host)
+
     def spawn(self, context, instance, image_id, network_info):
         def _create_image(context, instance, image_id):
             """Fetch image from glance and copy it to the remote system."""
@@ -626,6 +630,19 @@ class BaseOperator(object):
         return {'total_mem': int(total_mem),
                 'avail_mem': int(avail_mem)}
 
+    def get_host_uptime(self, host):
+        """
+        Get host uptime.
+        :returns: string - amount of time since last system startup
+        """
+        # The output of the command is like this:
+        # "02:54PM  up 24 days,  5:41, 1 user, load average: 0.06, 0.03, 0.02"
+        cmd = self.command.sysstat('-short %s' % self.connection_data.username)
+        output = self.run_vios_command(cmd)
+        # parse the sysstat output so we just return the uptime
+        system_time, uptime = output[0].split(',')[0:2]
+        return system_time + uptime
+
     def get_cpu_info(self):
         """Get CPU info.
 
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py
index 1f91e5ab2..8389b2c3d 100755
--- a/nova/virt/vmwareapi/driver.py
+++ b/nova/virt/vmwareapi/driver.py
@@ -127,6 +127,12 @@ class Failure(Exception):
 class VMwareESXDriver(driver.ComputeDriver):
     """The ESX host connection object."""
 
+    # VMwareAPI has both ESXi and vCenter API sets.
+    # The ESXi API are a proper sub-set of the vCenter API.
+    # That is to say, nearly all valid ESXi calls are
+    # valid vCenter calls. There are some small edge-case
+    # exceptions regarding VNC, CIM, User management & SSO.
+
     def __init__(self, virtapi, read_only=False, scheme="https"):
         super(VMwareESXDriver, self).__init__(virtapi)
 
@@ -338,6 +344,14 @@ class VMwareESXDriver(driver.ComputeDriver):
 class VMwareVCDriver(VMwareESXDriver):
     """The ESX host connection object."""
 
+    # The vCenter driver includes several additional VMware vSphere
+    # capabilities that include API that act on hosts or groups of
+    # hosts in clusters or non-cluster logical-groupings.
+    #
+    # vCenter is not a hypervisor itself, it works with multiple
+    # hypervisor host machines and their guests. This fact can
+    # subtly alter how vSphere and OpenStack interoperate.
+
     def __init__(self, virtapi, read_only=False, scheme="https"):
         super(VMwareVCDriver, self).__init__(virtapi)
         self._cluster_name = CONF.vmwareapi_cluster_name
@@ -399,6 +413,14 @@ class VMwareVCDriver(VMwareESXDriver):
                                    post_method, recover_method,
                                    block_migration)
 
+    def get_vnc_console(self, instance):
+        """Return link to instance's VNC console using vCenter logic."""
+        # In this situation, ESXi and vCenter require different
+        # API logic to create a valid VNC console connection object.
+        # In specific, vCenter does not actually run the VNC service
+        # itself. You must talk to the VNC host underneath vCenter.
+        return self._vmops.get_vnc_console_vcenter(instance)
+
 
 class VMwareAPISession(object):
     """
diff --git a/nova/virt/vmwareapi/fake.py b/nova/virt/vmwareapi/fake.py
index cd8302115..abf896c79 100644
--- a/nova/virt/vmwareapi/fake.py
+++ b/nova/virt/vmwareapi/fake.py
@@ -21,6 +21,7 @@
 A fake VMware VI API implementation.
 """
 
+import collections
 import pprint
 import uuid
 
@@ -83,28 +84,72 @@ def _get_objects(obj_type):
     return lst_objs
 
 
-class Prop(object):
+class Property(object):
     """Property Object base class."""
 
-    def __init__(self):
-        self.name = None
-        self.val = None
+    def __init__(self, name=None, val=None):
+        self.name = name
+        self.val = val
+
 
+class ManagedObjectReference(object):
+    """A managed object reference is a remote identifier."""
 
-class Obj(object):
-    def __init__(self, name, value):
+    def __init__(self, value="object-123", _type="ManagedObject"):
+        super(ManagedObjectReference, self)
+        # Managed Object Reference value attributes
+        # typically have values like vm-123 or
+        # host-232 and not UUID.
         self.value = value
-        self._type = name
+        # Managed Object Reference _type
+        # attributes hold the name of the type
+        # of the vCenter object the value
+        # attribute is the identifier for
+        self._type = _type
+
+
+class ObjectContent(object):
+    """ObjectContent array holds dynamic properties."""
+
+    # This class is a *fake* of a class sent back to us by
+    # SOAP. It has its own names. These names are decided
+    # for us by the API we are *faking* here.
+    def __init__(self, obj_ref, prop_list=None, missing_list=None):
+        self.obj = obj_ref
+
+        if not isinstance(prop_list, collections.Iterable):
+            prop_list = []
+
+        if not isinstance(missing_list, collections.Iterable):
+            missing_list = []
+
+        # propSet is the name your Python code will need to
+        # use since this is the name that the API will use
+        self.propSet = prop_list
+
+        # missingSet is the name your python code will
+        # need to use since this is the name that the
+        # API we are talking to will use.
+        self.missingSet = missing_list
 
 
 class ManagedObject(object):
-    """Managed Data Object base class."""
+    """Managed Object base class."""
 
     def __init__(self, name="ManagedObject", obj_ref=None, value=None):
         """Sets the obj property which acts as a reference to the object."""
         super(ManagedObject, self).__setattr__('objName', name)
+
+        # A managed object is a local representation of a
+        # remote object that you can reference using the
+        # object reference.
         if obj_ref is None:
-            obj_ref = Obj(name, value)
+            if value is None:
+                value = 'obj-123'
+            obj_ref = ManagedObjectReference(value, name)
+
+        # we use __setattr__ here because below the
+        # default setter has been altered for this class.
         object.__setattr__(self, 'obj', obj_ref)
         object.__setattr__(self, 'propSet', [])
 
@@ -124,16 +169,20 @@ class ManagedObject(object):
         return self.__getattr__(attr)
 
     def __setattr__(self, attr, val):
+        # TODO(hartsocks): this is adds unnecessary complexity to the class
         for prop in self.propSet:
             if prop.name == attr:
                 prop.val = val
                 return
-        elem = Prop()
+        elem = Property()
         elem.name = attr
         elem.val = val
         self.propSet.append(elem)
 
     def __getattr__(self, attr):
+        # TODO(hartsocks): remove this
+        # in a real ManagedObject you have to iterate the propSet
+        # in a real ManagedObject, the propSet is a *set* not a list
         for elem in self.propSet:
             if elem.name == attr:
                 return elem.val
@@ -215,6 +264,8 @@ class VirtualMachine(ManagedObject):
         self.set("summary.config.memorySizeMB", kwargs.get("mem", 1))
         self.set("config.hardware.device", kwargs.get("virtual_device", None))
         self.set("config.extraConfig", kwargs.get("extra_config", None))
+        self.set('runtime.host',
+                 ManagedObjectReference(value='host-123', _type="HostSystem"))
         self.device = kwargs.get("virtual_device")
 
     def reconfig(self, factory, val):
@@ -310,8 +361,8 @@ class HostNetworkSystem(ManagedObject):
 class HostSystem(ManagedObject):
     """Host System class."""
 
-    def __init__(self):
-        super(HostSystem, self).__init__("HostSystem")
+    def __init__(self, obj_ref=None, value='host-123'):
+        super(HostSystem, self).__init__("HostSystem", obj_ref, value)
         self.set("name", "ha-host")
         if _db_content.get("HostNetworkSystem", None) is None:
             create_host_network_system()
diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index 117669700..d8e063cad 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -20,6 +20,7 @@ The VMware API VM utility module to build SOAP object specs.
 """
 
 import copy
+
 from nova import exception
 from nova.virt.vmwareapi import vim_util
 
@@ -526,6 +527,111 @@ def get_vm_ref(session, instance):
     return vm_ref
 
 
+def get_host_ref_from_id(session, host_id, property_list=None):
+    """Get a host reference object for a host_id string."""
+
+    if property_list is None:
+        property_list = ['name']
+
+    host_refs = session._call_method(
+                    vim_util, "get_objects",
+                    "HostSystem", property_list)
+
+    for ref in host_refs:
+        if ref.obj.value == host_id:
+            return ref
+
+
+def get_host_id_from_vm_ref(session, vm_ref):
+    """
+    This method allows you to find the managed object
+    ID of the host running a VM. Since vMotion can
+    change the value, you should not presume that this
+    is a value that you can cache for very long and
+    should be prepared to allow for it to change.
+
+    :param session: a vSphere API connection
+    :param vm_ref: a reference object to the running VM
+    :return: the host_id running the virtual machine
+    """
+
+    # to prevent typographical errors below
+    property_name = 'runtime.host'
+
+    # a property collector in VMware vSphere Management API
+    # is a set of local representations of remote values.
+    # property_set here, is a local representation of the
+    # properties we are querying for.
+    property_set = session._call_method(
+            vim_util, "get_object_properties",
+            None, vm_ref, vm_ref._type, [property_name])
+
+    prop = property_from_property_set(
+        property_name, property_set)
+
+    if prop is not None:
+        prop = prop.val.value
+    else:
+        # reaching here represents an impossible state
+        raise RuntimeError(
+            "Virtual Machine %s exists without a runtime.host!"
+            % (vm_ref))
+
+    return prop
+
+
+def property_from_property_set(property_name, property_set):
+    '''
+    Use this method to filter property collector results.
+
+    Because network traffic is expensive, multiple
+    VMwareAPI calls will sometimes pile-up properties
+    to be collected. That means results may contain
+    many different values for multiple purposes.
+
+    This helper will filter a list for a single result
+    and filter the properties of that result to find
+    the single value of whatever type resides in that
+    result. This could be a ManagedObjectReference ID
+    or a complex value.
+
+    :param property_name: name of property you want
+    :param property_set: all results from query
+    :return: the value of the property.
+    '''
+
+    for prop in property_set:
+        p = _property_from_propSet(prop.propSet, property_name)
+        if p is not None:
+            return p
+
+
+def _property_from_propSet(propSet, name='name'):
+    for p in propSet:
+        if p.name == name:
+            return p
+
+
+def get_host_ref_for_vm(session, instance, props):
+    """Get the ESXi host running a VM by its name."""
+
+    vm_ref = get_vm_ref(session, instance)
+    host_id = get_host_id_from_vm_ref(session, vm_ref)
+    return get_host_ref_from_id(session, host_id, props)
+
+
+def get_host_name_for_vm(session, instance):
+    """Get the ESXi host running a VM by its name."""
+    host_ref = get_host_ref_for_vm(session, instance, ['name'])
+    return get_host_name_from_host_ref(host_ref)
+
+
+def get_host_name_from_host_ref(host_ref):
+    p = _property_from_propSet(host_ref.propSet)
+    if p is not None:
+        return p.val
+
+
 def get_cluster_ref_from_name(session, cluster_name):
     """Get reference to the cluster with the name specified."""
     cls = session._call_method(vim_util, "get_objects",
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index 1afead6b9..e8f63f1d7 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -1089,6 +1089,26 @@ class VMwareVMOps(object):
                 'port': self._get_vnc_port(vm_ref),
                 'internal_access_path': None}
 
+    def get_vnc_console_vcenter(self, instance):
+        """Return connection info for a vnc console using vCenter logic."""
+
+        # vCenter does not run virtual machines and does not run
+        # a VNC proxy. Instead, you need to tell OpenStack to talk
+        # directly to the ESX host running the VM you are attempting
+        # to connect to via VNC.
+
+        vnc_console = self.get_vnc_console(instance)
+        host_name = vm_util.get_host_name_for_vm(
+                        self._session,
+                        instance)
+        vnc_console['host'] = host_name
+
+        # NOTE: VM can move hosts in some situations. Debug for admins.
+        LOG.debug(_("VM %(uuid)s is currently on host %(host_name)s"),
+                {'uuid': instance['name'], 'host_name': host_name})
+
+        return vnc_console
+
     @staticmethod
     def _get_vnc_port(vm_ref):
         """Return VNC port for an VM."""
diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py
index 7a0b4a67e..853bc3262 100644
--- a/nova/virt/xenapi/volume_utils.py
+++ b/nova/virt/xenapi/volume_utils.py
@@ -233,8 +233,16 @@ def parse_volume_info(connection_data):
     target_host = _get_target_host(target_portal)
     target_port = _get_target_port(target_portal)
     target_iqn = connection_data['target_iqn']
-    LOG.debug('(vol_id,number,host,port,iqn): (%s,%s,%s,%s)',
-              (volume_id, target_host, target_port, target_iqn))
+
+    log_params = {
+        "vol_id": volume_id,
+        "host": target_host,
+        "port": target_port,
+        "iqn": target_iqn
+    }
+    LOG.debug(_('(vol_id,host,port,iqn): '
+              '(%(vol_id)s,%(host)s,%(port)s,%(iqn)s)'), log_params)
+
     if (volume_id is None or
         target_host is None or
         target_iqn is None):
diff --git a/setup.cfg b/setup.cfg
index 5b52a5464..0d7e474cd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,6 +54,7 @@ console_scripts =
     nova-xvpvncproxy = nova.cmd.xvpvncproxy:main
 
 nova.api.v3.extensions =
+    cells = nova.api.openstack.compute.plugins.v3.cells:Cells
     certificates = nova.api.openstack.compute.plugins.v3.certificates:Certificates
     consoles = nova.api.openstack.compute.plugins.v3.consoles:Consoles
     evacuate = nova.api.openstack.compute.plugins.v3.evacuate:Evacuate
@@ -61,10 +62,13 @@ nova.api.v3.extensions =
     fixed_ips = nova.api.openstack.compute.plugins.v3.fixed_ips:FixedIPs
     flavors = nova.api.openstack.compute.plugins.v3.flavors:Flavors
     flavor_access = nova.api.openstack.compute.plugins.v3.flavor_access:FlavorAccess
+    flavor_disabled = nova.api.openstack.compute.plugins.v3.flavor_disabled:FlavorDisabled
+    images = nova.api.openstack.compute.plugins.v3.images:Images
     ips = nova.api.openstack.compute.plugins.v3.ips:IPs
     keypairs = nova.api.openstack.compute.plugins.v3.keypairs:Keypairs
     quota_sets = nova.api.openstack.compute.plugins.v3.quota_sets:QuotaSets
     rescue = nova.api.openstack.compute.plugins.v3.rescue:Rescue
+    server_diagnostics = nova.api.openstack.compute.plugins.v3.server_diagnostics:ServerDiagnostics
     servers = nova.api.openstack.compute.plugins.v3.servers:Servers
 
 nova.api.v3.extensions.server.create =